summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.6.2.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-02 15:56:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-02 15:56:46 -0700
commitedc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6 (patch)
tree40bd9da3afb64753b3a6b6ad8a716f129eb72514 /Documentation/RelNotes/1.6.2.txt
parentMerge branch 'kb/ancestry-path-threedots' (diff)
parentcombine-diff.c: Fix output when changes are exactly 3 lines apart (diff)
downloadtgif-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 'Documentation/RelNotes/1.6.2.txt')
0 files changed, 0 insertions, 0 deletions