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