summaryrefslogtreecommitdiff
path: root/t/t6023-merge-rename-nocruft.sh
AgeCommit message (Expand)AuthorFilesLines
2007-02-03Keep untracked files not involved in a merge.Libravatar Shawn O. Pearce1-0/+42
2006-12-13Remove uncontested renamed files during merge.Libravatar Shawn Pearce1-0/+97