diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:14 -0800 |
| commit | 93825874671ae15296442b1e7e39166c1754c934 (patch) | |
| tree | e6b0eb8f73368d7388142d53491e70d1f8a9dba3 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'jc/maint-fix-mailinfo-strip' (diff) | |
| parent | add-interactive: fix bogus diff header line ordering (diff) | |
| download | tgif-93825874671ae15296442b1e7e39166c1754c934.tar.xz | |
Merge branch 'jk/maint-add--interactive-delete'
* jk/maint-add--interactive-delete:
add-interactive: fix bogus diff header line ordering
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions