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 /Documentation/RelNotes/1.5.4.2.txt | |
| parent | Merge branch 'jc/fix-diff-files-unmerged' into maint (diff) | |
| parent | merge-one-file: fix broken merges with alternate work trees (diff) | |
| download | tgif-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 'Documentation/RelNotes/1.5.4.2.txt')
0 files changed, 0 insertions, 0 deletions