| Commit message (Expand) | Author | Age | Files | Lines |
* | mergetools/diffmerge: support DiffMerge as a git mergetool | Stefan Saasen | 2013-10-13 | 1 | -0/+15 |
* | Sync with v1.8.2.3 | Junio C Hamano | 2013-05-09 | 1 | -1/+1 |
|\ |
|
| * | mergetools/kdiff3: do not use --auto when diffing | David Aguilar | 2013-05-09 | 1 | -1/+1 |
* | | 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 |
|/ |
|
* | Merge branch 'da/p4merge-mktemp-fix' | Junio C Hamano | 2013-02-14 | 1 | -1/+1 |
|\ |
|
| * | p4merge: fix printf usage | David Aguilar | 2013-02-10 | 1 | -1/+1 |
* | | Merge branch 'ss/mergetools-tortoise' | Junio C Hamano | 2013-02-07 | 1 | -4/+21 |
|\ \ |
|
| * | | mergetools: teach tortoisemerge to handle filenames with SP correctly | Sven Strickroth | 2013-02-01 | 1 | -3/+11 |
| * | | mergetools: support TortoiseGitMerge | Sven Strickroth | 2013-01-26 | 1 | -1/+10 |
* | | | Merge branch 'jk/mergetool' | Junio C Hamano | 2013-02-07 | 5 | -32/+5 |
|\ \ \
| |_|/
|/| | |
|
| * | | mergetools: simplify how we handle "vim" and "defaults" | David Aguilar | 2013-01-28 | 5 | -22/+3 |
| * | | mergetools/vim: remove redundant diff command | David Aguilar | 2013-01-27 | 1 | -10/+2 |
* | | | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder | David Aguilar | 2012-12-26 | 1 | -14/+13 |
| |/
|/| |
|
* | | Merge branch 'da/mergetools-p4' | Jeff King | 2012-10-25 | 1 | -0/+25 |
|\ \
| |/
|/| |
|
| * | mergetools/p4merge: Handle "/dev/null" | David Aguilar | 2012-10-11 | 1 | -0/+25 |
* | | Merge branch 'da/mergetool-custom' | Junio C Hamano | 2012-10-01 | 1 | -26/+2 |
|\ \ |
|
| * | | mergetool--lib: Allow custom commands to override built-ins | David Aguilar | 2012-09-25 | 1 | -26/+2 |
| |/ |
|
* | | Add Code Compare v2.80.4 as a merge / diff tool for Windows | Sebastian Schuberth | 2012-08-10 | 1 | -0/+25 |
|/ |
|
* | mergetools: add a plug-in to support DeltaWalker | Tim Henigan | 2012-03-05 | 1 | -0/+21 |
* | Merge branch 'jn/ancient-meld-support' | Junio C Hamano | 2012-02-14 | 1 | -1/+1 |
|\ |
|
| * | mergetools/meld: Use --help output to detect --output supportjn/ancient-meld-support | Jonathan Nieder | 2012-02-10 | 1 | -1/+1 |
* | | mergetools: use the correct tool for Beyond Compare 3 on Windows | Pat Thoyts | 2011-10-15 | 1 | -1/+6 |
|/ |
|
* | mergetools/meld: Use '--output' when available | David Aguilar | 2011-08-19 | 1 | -1/+24 |
* | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 | 15 | -0/+306 |