From: Junio C Hamano <junkio@cox.net>
Date: Mon, 24 Apr 2006 09:05:55 +0000 (-0700)
Subject: Merge branch 'jc/unresolve'
X-Git-Tag: v1.4.0-rc1~222
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cdb63506a0d632b4bf81378756b53f30d7198b50;p=git.git

Merge branch 'jc/unresolve'

* jc/unresolve:
  git-update-index --unresolve
  Add git-unresolve <paths>...
---

cdb63506a0d632b4bf81378756b53f30d7198b50