diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:10:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:10:14 -0800 |
| commit | 7bb5321be0ecb70a990ad49da2a1366c19201372 (patch) | |
| tree | 82a8429e88beddb3b8bf8fb84aa39800670ae31d /Documentation/RelNotes-1.5.3.6.txt | |
| parent | Merge branch 'js/maint-merge-recursive-r-d-conflict' (diff) | |
| parent | diff: add option to show context between close hunks (diff) | |
| download | tgif-7bb5321be0ecb70a990ad49da2a1366c19201372.tar.xz | |
Merge branch 'rs/diff-ihc'
* rs/diff-ihc:
diff: add option to show context between close hunks
Conflicts:
Documentation/diff-options.txt
Diffstat (limited to 'Documentation/RelNotes-1.5.3.6.txt')
0 files changed, 0 insertions, 0 deletions