Age | Commit message (Expand) | Author | Files | Lines |
2017-06-18 | mergetools/meld: improve compatibiilty with Meld on macOS X | David Aguilar | 1 | -1/+1 |
2016-12-19 | Merge branch 'da/mergetool-xxdiff-hotkey' | Junio C Hamano | 1 | -5/+5 |
2016-12-11 | mergetools: fix xxdiff hotkeys | David Aguilar | 1 | -5/+5 |
2016-11-29 | mergetools/vimdiff: trust Vim's exit code | David Aguilar | 1 | -0/+4 |
2016-11-29 | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 19 | -27/+26 |
2016-04-04 | mergetools: add support for ExamDiff | Jacob Nisnevich | 1 | -0/+18 |
2016-04-04 | mergetools: create mergetool_find_win32_cmd() helper function for winmerge | Jacob Nisnevich | 1 | -20/+1 |
2016-02-12 | mergetool: reorder vim/gvim buffers in three-way diffs | Dickson Wong | 1 | -2/+2 |
2015-05-20 | mergetools: add winmerge as a builtin tool | David Aguilar | 1 | -0/+36 |
2014-11-21 | mergetools: stop setting $status in merge_cmd() | David Aguilar | 3 | -3/+0 |
2014-10-29 | Merge branch 'oc/mergetools-beyondcompare' | Junio C Hamano | 2 | -25/+26 |
2014-10-21 | mergetool: rename bc3 to bc | Junio C Hamano | 2 | -25/+26 |
2014-10-16 | mergetools/meld: make usage of `--output` configurable and more robust | David Aguilar | 1 | -2/+7 |
2014-04-22 | mergetools: add vimdiff3 mode | Felipe Contreras | 3 | -2/+14 |
2013-10-13 | mergetools/diffmerge: support DiffMerge as a git mergetool | Stefan Saasen | 1 | -0/+15 |
2013-05-09 | Sync with v1.8.2.3 | Junio C Hamano | 1 | -1/+1 |
2013-05-09 | mergetools/kdiff3: do not use --auto when diffing | David Aguilar | 1 | -1/+1 |
2013-03-13 | mergetools/p4merge: create a base if none available | Kevin Bracey | 1 | -1/+5 |
2013-03-13 | mergetools/p4merge: swap LOCAL and REMOTE | Kevin Bracey | 1 | -1/+1 |
2013-02-14 | Merge branch 'da/p4merge-mktemp-fix' | Junio C Hamano | 1 | -1/+1 |
2013-02-10 | p4merge: fix printf usage | David Aguilar | 1 | -1/+1 |
2013-02-07 | Merge branch 'ss/mergetools-tortoise' | Junio C Hamano | 1 | -4/+21 |
2013-02-07 | Merge branch 'jk/mergetool' | Junio C Hamano | 5 | -32/+5 |
2013-02-01 | mergetools: teach tortoisemerge to handle filenames with SP correctly | Sven Strickroth | 1 | -3/+11 |
2013-01-28 | mergetools: simplify how we handle "vim" and "defaults" | David Aguilar | 5 | -22/+3 |
2013-01-27 | mergetools/vim: remove redundant diff command | David Aguilar | 1 | -10/+2 |
2013-01-26 | mergetools: support TortoiseGitMerge | Sven Strickroth | 1 | -1/+10 |
2012-12-26 | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder | David Aguilar | 1 | -14/+13 |
2012-10-25 | Merge branch 'da/mergetools-p4' | Jeff King | 1 | -0/+25 |
2012-10-11 | mergetools/p4merge: Handle "/dev/null" | David Aguilar | 1 | -0/+25 |
2012-10-01 | Merge branch 'da/mergetool-custom' | Junio C Hamano | 1 | -26/+2 |
2012-09-25 | mergetool--lib: Allow custom commands to override built-ins | David Aguilar | 1 | -26/+2 |
2012-08-10 | Add Code Compare v2.80.4 as a merge / diff tool for Windows | Sebastian Schuberth | 1 | -0/+25 |
2012-03-05 | mergetools: add a plug-in to support DeltaWalker | Tim Henigan | 1 | -0/+21 |
2012-02-14 | Merge branch 'jn/ancient-meld-support' | Junio C Hamano | 1 | -1/+1 |
2012-02-10 | mergetools/meld: Use --help output to detect --output support | Jonathan Nieder | 1 | -1/+1 |
2011-10-15 | mergetools: use the correct tool for Beyond Compare 3 on Windows | Pat Thoyts | 1 | -1/+6 |
2011-08-19 | mergetools/meld: Use '--output' when available | David Aguilar | 1 | -1/+24 |
2011-08-19 | mergetool--lib: Refactor tools into separate files | David Aguilar | 15 | -0/+306 |