![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Aug 2011 22:00:08 +0000 (15:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Aug 2011 22:00:08 +0000 (15:00 -0700) |
* jc/maint-reset-unmerged-path:
reset [<commit>] paths...: do not mishandle unmerged paths
reset [<commit>] paths...: do not mishandle unmerged paths
| 1 | 2 | |||
|---|---|---|---|---|
| diff-lib.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc diff-lib.c
Simple merge