Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2016-11-29 | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | 1 | -2/+0 | |
2013-03-13 | mergetools/p4merge: create a base if none available | 1 | -1/+5 | |
2013-03-13 | mergetools/p4merge: swap LOCAL and REMOTE | 1 | -1/+1 | |
2013-02-10 | p4merge: fix printf usage | 1 | -1/+1 | |
2012-12-26 | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder | 1 | -14/+13 | |
2012-10-11 | mergetools/p4merge: Handle "/dev/null" | 1 | -0/+25 | |
2011-08-19 | mergetool--lib: Refactor tools into separate files | 1 | -0/+10 |