From: Junio C Hamano <junkio@cox.net>
Date: Thu, 28 Sep 2006 04:41:24 +0000 (-0700)
Subject: Merge branch 'jc/deprecate-recursive'
X-Git-Tag: v1.4.3-rc1~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e38604e00637a7b25c12c0ef1423a6135cbf049b;p=git.git

Merge branch 'jc/deprecate-recursive'

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

e38604e00637a7b25c12c0ef1423a6135cbf049b