summaryrefslogtreecommitdiffstats
path: root/t/t6046-merge-skip-unneeded-updates.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6046/t9833: fix use of "VAR=VAL cmd" with a shell functionEric Sunshine2018-07-161-1/+3
* merge-recursive: fix check for skipability of working tree updatesElijah Newren2018-05-081-5/+5
* t6046: testcases checking whether updates can be skipped in a mergeElijah Newren2018-05-081-0/+761