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

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

Junio C Hamano committed Aug 1, 2011 at 15:00 UTC 1df561fb4861708ce208488aa307516c0ecfa968

No changes.