summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
AgeCommit message (Expand)AuthorFilesLines
2013-03-13mergetools/p4merge: create a base if none availableLibravatar Kevin Bracey1-1/+5
2013-03-13mergetools/p4merge: swap LOCAL and REMOTELibravatar Kevin Bracey1-1/+1
2013-02-10p4merge: fix printf usageLibravatar David Aguilar1-1/+1
2012-12-26mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderLibravatar David Aguilar1-14/+13
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