![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:54:08 +0000 (10:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:54:08 +0000 (10:54 -0700) | ||
| commit | ac13e7c514d6790cc59041545f26b3f5da543b25 | |
| tree | 567f0447e8274f14813543bdf74e621d8b0d41e6 | tree | snapshot |
| parent | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 | commit | diff |
| parent | 6aaeca900b05a8265d1930d3dc0a2df19002771f | commit | diff |
Merge branch 'jk/merge-one-file-working-tree'
* jk/merge-one-file-working-tree:
merge-one-file: fix broken merges with alternate work trees
add tests for merge-index / merge-one-file
* jk/merge-one-file-working-tree:
merge-one-file: fix broken merges with alternate work trees
add tests for merge-index / merge-one-file
| git-merge-one-file.sh | diff1 | | diff2 | | blob | history |