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