summaryrefslogtreecommitdiff
path: root/include/conflicts
AgeCommit message (Collapse)AuthorLines
2009-02-15still more commentsDaniel Friesel-0/+6
2008-11-14include/conflicts: Check aliasesDaniel Friesel-1/+8
2008-11-13include/conflicts: removed unneccessary loopsDaniel Friesel-8/+3
2008-10-09include/conflicts: Use $HOME instead of /home/derf...Daniel Friesel-3/+3
2008-09-10include/conflicts: Display multiple files properlyDaniel Friesel-6/+6
2008-09-06Added 'conflicts' to check for double path entriesDaniel Friesel-0/+41