summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
AgeCommit message (Expand)Author
2012-12-27mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar
2012-10-11mergetools/p4merge: Handle "/dev/null"David Aguilar
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar