Code

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)
commite38604e00637a7b25c12c0ef1423a6135cbf049b
treec8df7512be7d8d29e4f023947e5de7f55e5c9f48
parent07ccbff89b6736a5253e6bba62c9a8e1f2da0ffd
parenta06f678eb998862ea83b73e46ece32f99132935b
Merge branch 'jc/deprecate-recursive'

* jc/deprecate-recursive:
  Deprecate merge-recursive.py