path: root/mergetools
AgeCommit message (Expand)Author
2017-06-19mergetools/meld: improve compatibiilty with Meld on macOS XDavid Aguilar
2016-12-19Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano
2016-12-12mergetools: fix xxdiff hotkeysDavid Aguilar
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2016-04-04mergetools: add support for ExamDiffJacob Nisnevich
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich
2016-02-12mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong
2015-05-20mergetools: add winmerge as a builtin toolDavid Aguilar
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar
2014-10-29Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano
2014-10-21mergetool: rename bc3 to bcJunio C Hamano
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar
2014-04-22mergetools: add vimdiff3 modeFelipe Contreras
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen
2013-05-09Sync with v1.8.2.3Junio C Hamano
2013-05-09mergetools/kdiff3: do not use --auto when diffingDavid Aguilar
2013-03-13mergetools/p4merge: create a base if none availableKevin Bracey
2013-03-13mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey
2013-02-15Merge branch 'da/p4merge-mktemp-fix'Junio C Hamano
2013-02-10p4merge: fix printf usageDavid Aguilar
2013-02-07Merge branch 'ss/mergetools-tortoise'Junio C Hamano
2013-02-07Merge branch 'jk/mergetool'Junio C Hamano
2013-02-02mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth
2013-01-29mergetools: simplify how we handle "vim" and "defaults"David Aguilar
2013-01-28mergetools/vim: remove redundant diff commandDavid Aguilar
2013-01-27mergetools: support TortoiseGitMergeSven Strickroth
2012-12-27mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar
2012-10-25Merge branch 'da/mergetools-p4'Jeff King
2012-10-11mergetools/p4merge: Handle "/dev/null"David Aguilar
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth
2012-03-05mergetools: add a plug-in to support DeltaWalkerTim Henigan
2012-02-14Merge branch 'jn/ancient-meld-support'Junio C Hamano
2012-02-10mergetools/meld: Use --help output to detect --output supportJonathan Nieder
2011-10-16mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts
2011-08-19mergetools/meld: Use '--output' when availableDavid Aguilar
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar