summaryrefslogtreecommitdiffstats
path: root/t/t6046-merge-skip-unneeded-updates.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6022, t6046: fix flaky files-are-updated checksElijah Newren2020-03-131-14/+7
* t6022, t6046: test expected behavior instead of testing a proxy for itElijah Newren2020-02-271-32/+57
* t604[236]: do not run setup in separate testsElijah Newren2019-10-231-73/+62
* merge-recursive: switch directory rename detection defaultElijah Newren2019-04-081-4/+4
* 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