From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Feb 2007 00:44:27 +0000 (-0800)
Subject: Merge branch 'jc/deprecate'
X-Git-Tag: v1.5.1-rc1~300
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8f2aaa17297d6b21c84641edc2f6135575a003c;p=git.git

Merge branch 'jc/deprecate'

As previously announced, diff-stages and resolve are now gone.
---

f8f2aaa17297d6b21c84641edc2f6135575a003c