diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:56:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:56:46 -0700 |
| commit | edc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6 (patch) | |
| tree | 40bd9da3afb64753b3a6b6ad8a716f129eb72514 /mergesort.h | |
| parent | Merge branch 'kb/ancestry-path-threedots' (diff) | |
| parent | combine-diff.c: Fix output when changes are exactly 3 lines apart (diff) | |
| download | tgif-edc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6.tar.xz | |
Merge branch 'mk/combine-diff-context-horizon-fix'
"git diff -c -p" was not showing a deleted line from a hunk when
another hunk immediately begins where the earlier one ends.
* mk/combine-diff-context-horizon-fix:
combine-diff.c: Fix output when changes are exactly 3 lines apart
Diffstat (limited to 'mergesort.h')
0 files changed, 0 insertions, 0 deletions