From: Junio C Hamano <junkio@cox.net>
Date: Thu, 20 Apr 2006 06:52:30 +0000 (-0700)
Subject: Merge branch 'jc/unresolve' into next
X-Git-Tag: v1.4.1-rc1~199
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f31613d45afa1e5c87c4a9a964ef9b474ef73932

Merge branch 'jc/unresolve' into next

* jc/unresolve:
git-update-index --unresolve
---

f31613d45afa1e5c87c4a9a964ef9b474ef73932