aboutsummaryrefslogtreecommitdiff
path: root/t/t6023-merge-rename-nocruft.sh
Commit message (Expand)AuthorAge
* test-suite: Make test script numbers uniqueJohannes Sixt2009-03-14
* Keep untracked files not involved in a merge.Shawn O. Pearce2007-02-03
* Remove uncontested renamed files during merge.Shawn Pearce2006-12-13