![[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) | ||
| commit | 8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af | |
| tree | 877e3cbaafa693fb8752acf55a693a27b15f9737 | tree | snapshot |
| parent | a613b534bca2d56f2ad67b3a7f0cf2b34f031260 | commit | diff |
| parent | 6aaeca900b05a8265d1930d3dc0a2df19002771f | commit | diff |
Merge branch 'jk/merge-one-file-working-tree' into maint
* 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 |