summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
* mergetools/p4merge: create a base if none availableKevin Bracey2013-03-131-1/+5
* mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey2013-03-131-1/+1
* p4merge: fix printf usageDavid Aguilar2013-02-101-1/+1
* mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar2012-12-261-14/+13
* mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-111-0/+25
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+10