![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:44:19 +0000 (10:44 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:44:19 +0000 (10:44 -0700) |
* jk/merge-one-file-working-tree:
merge-one-file: fix broken merges with alternate work trees
add tests for merge-index / merge-one-file
merge-one-file: fix broken merges with alternate work trees
add tests for merge-index / merge-one-file
| 1 | 2 | |||
|---|---|---|---|---|
| git-merge-one-file.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-merge-one-file.sh
Simple merge