summaryrefslogtreecommitdiff
path: root/t/t6023-merge-rename-nocruft.sh
Commit message (Expand)AuthorAgeFilesLines
* Keep untracked files not involved in a merge.Shawn O. Pearce2007-02-031-0/+42
* Remove uncontested renamed files during merge.Shawn Pearce2006-12-131-0/+97