summaryrefslogtreecommitdiffstats
path: root/test/pacman/tests/fileconflict030.py
AgeCommit message (Expand)AuthorFilesLines
2013-06-03improve dir->file transition conflict resolutionAndrew Gregory1-0/+17