aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4046-diff-unmerged.sh
AgeCommit message (Expand)AuthorFilesLines
30 hoursMerge branch 'rs/external-diff-with-exit-code'Junio C Hamano1-0/+8
10 daysdiff: report unmerged paths as changes in run_diff_cmd()René Scharfe1-0/+8
2024-04-26t4046: avoid continue in &&-chain for zshbrian m. carlson1-7/+9
2022-12-15diff: fix regression with --stat and unmerged filePeter Grayson1-0/+10
2022-01-03Merge branch 'es/test-chain-lint'Junio C Hamano1-5/+5
2021-12-13t4000-t4999: detect and signal failure within loopEric Sunshine1-4/+4
2021-12-13tests: fix broken &&-chains in compound statementsEric Sunshine1-1/+1
2021-11-01leak tests: mark some diff tests as passing with SANITIZE=leakÆvar Arnfjörð Bjarmason1-0/+2
2018-05-14t: switch $_z40 to $ZERO_OIDbrian m. carlson1-7/+7
2015-03-25t: fix some trivial cases of ignored exit codes in loopsJeff King1-4/+4
2011-04-23diff-files: show unmerged entries correctlyJunio C Hamano1-0/+87