diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
| commit | 919451330b55366ac207e575c1982bc8fa5220ed (patch) | |
| tree | 5b11a7fb5c80483a5e29532ce42e72dd77f1d6e5 /Documentation/merge-config.txt | |
| parent | Merge branch 'mm/mkstemps-mode-for-packfiles' into maint (diff) | |
| parent | add-interactive: fix bogus diff header line ordering (diff) | |
| download | tgif-919451330b55366ac207e575c1982bc8fa5220ed.tar.xz | |
Merge branch 'jk/maint-add--interactive-delete' into maint
* jk/maint-add--interactive-delete:
add-interactive: fix bogus diff header line ordering
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions