diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:54:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:54:08 -0700 |
| commit | ac13e7c514d6790cc59041545f26b3f5da543b25 (patch) | |
| tree | 567f0447e8274f14813543bdf74e621d8b0d41e6 /git-mergetool--lib.sh | |
| parent | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (diff) | |
| parent | 6aaeca900b05a8265d1930d3dc0a2df19002771f (diff) | |
| download | git-ac13e7c514d6790cc59041545f26b3f5da543b25.tar.gz git-ac13e7c514d6790cc59041545f26b3f5da543b25.tar.xz | |
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions