summaryrefslogtreecommitdiff
path: root/t/t6023-merge-rename-nocruft.sh
AgeCommit message (Expand)Author
2009-03-14test-suite: Make test script numbers uniqueJohannes Sixt
2007-02-04Keep untracked files not involved in a merge.Shawn O. Pearce
2006-12-13Remove uncontested renamed files during merge.Shawn Pearce