summaryrefslogtreecommitdiff
path: root/include/conflicts
AgeCommit message (Collapse)AuthorLines
2008-09-10include/conflicts: Display multiple files properlyDaniel Friesel-6/+6
2008-09-06Added 'conflicts' to check for double path entriesDaniel Friesel-0/+41