summaryrefslogtreecommitdiff
path: root/t/t4046-diff-unmerged.sh
Commit message (Expand)AuthorAgeFilesLines
* t: switch $_z40 to $ZERO_OIDbrian m. carlson2018-05-141-7/+7
* t: fix some trivial cases of ignored exit codes in loopsJeff King2015-03-251-4/+4
* diff-files: show unmerged entries correctlyJunio C Hamano2011-04-231-0/+87