diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:44:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:44:19 -0700 |
| commit | 8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af (patch) | |
| tree | 877e3cbaafa693fb8752acf55a693a27b15f9737 /git-gui | |
| parent | a613b534bca2d56f2ad67b3a7f0cf2b34f031260 (diff) | |
| parent | 6aaeca900b05a8265d1930d3dc0a2df19002771f (diff) | |
| download | git-8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af.tar.gz git-8272bcabac0b68e6d526ec0fcbc6d6e532b3e2af.tar.xz | |
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
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions