summaryrefslogtreecommitdiff
path: root/t/t4038-diff-combined.sh
Commit message (Expand)AuthorAgeFilesLines
* diff: support ^! for mergesRené Scharfe2022-10-011-0/+10
* t4000-t4999: detect and signal failure within loopEric Sunshine2021-12-131-1/+1
* test libs: rename "diff-lib" to "lib-diff"Ævar Arnfjörð Bjarmason2021-02-121-1/+1
* t4*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-8/+8
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* Merge branch 'jk/lore-is-the-archive'Junio C Hamano2019-12-061-1/+1
|\
| * doc: replace public-inbox links with lore.kernel.orgJeff King2019-11-301-1/+1
* | Merge branch 'bc/hash-independent-tests-part-6'Junio C Hamano2019-11-101-6/+13
|\ \
| * | t4038: abstract away SHA-1 specific constantsbrian m. carlson2019-10-281-6/+13
| |/
* | t4038: Remove non-portable '-a' option passed to test_cmpCB Bailey2019-09-281-1/+1
|/
* t4038-diff-combined: quote paths with whitespaceTodd Zullinger2019-03-181-4/+4
* log,diff-tree: add --combined-all-paths optionElijah Newren2019-02-071-0/+88
* doc: replace more gmane linksab/doc-replace-gmane-linksJunio C Hamano2017-05-091-1/+1
* Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2014-08-261-0/+34
|\
| * intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fixJeff King2014-08-201-0/+34
* | t4038-diff-combined.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-301-1/+1
|/
* 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