summaryrefslogtreecommitdiff
path: root/t/t4038-diff-combined.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk/combine-diff-context-horizon-fix'Junio C Hamano2013-06-021-0/+48
|\
| * combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2013-05-151-0/+48
* | combine-diff: coalesce lost lines optimallyAntoine Pelisse2013-03-251-0/+129
* | Allow combined diff to ignore white-spacesAntoine Pelisse2013-03-141-0/+111
* | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-051-0/+24
|/
* combined diff: correctly handle truncated fileThomas Rast2010-04-171-0/+8
* tests: update tests that used to failJunio C Hamano2010-01-281-1/+1
* diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano2009-07-221-0/+84