Merge branch 'jc/deprecate-recursive'
authorJunio C Hamano <junkio@cox.net>
Thu, 28 Sep 2006 04:41:24 +0000 (21:41 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Sep 2006 04:41:24 +0000 (21:41 -0700)
* jc/deprecate-recursive:
  Deprecate merge-recursive.py


Trivial merge