summaryrefslogtreecommitdiff
path: root/test/pacman/tests/fileconflict030.py
Commit message (Expand)AuthorAge
* improve dir->file transition conflict resolutionAndrew Gregory2013-06-03