Code

Merge branch 'jc/unresolve'
authorJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:05:55 +0000 (02:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:05:55 +0000 (02:05 -0700)
* jc/unresolve:
  git-update-index --unresolve
  Add git-unresolve <paths>...


Trivial merge