Merge branch 'jc/maint-reset-unmerged-path' into maint

* jc/maint-reset-unmerged-path: reset [<commit>] paths...: do not mishandle unmerged paths

Junio C Hamano committed Aug 16, 2011 at 11:41 UTC 7aa50897dda0360b9cbbe23e723a5aee461e1d71

No changes.