summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
Commit message (Expand)AuthorAgeFilesLines
* mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-111-0/+25
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+10