summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
AgeCommit message (Expand)AuthorFilesLines
2012-10-11mergetools/p4merge: Handle "/dev/null"Libravatar David Aguilar1-0/+25
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar1-0/+10