summaryrefslogtreecommitdiff
path: root/mergetools
AgeCommit message (Expand)AuthorFilesLines
2014-10-29Merge branch 'oc/mergetools-beyondcompare'Libravatar Junio C Hamano2-25/+26
2014-10-21mergetool: rename bc3 to bcLibravatar Junio C Hamano2-25/+26
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustLibravatar David Aguilar1-2/+7
2014-04-22mergetools: add vimdiff3 modeLibravatar Felipe Contreras3-2/+14
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolLibravatar Stefan Saasen1-0/+15
2013-05-09Sync with v1.8.2.3Libravatar Junio C Hamano1-1/+1
2013-05-09mergetools/kdiff3: do not use --auto when diffingLibravatar David Aguilar1-1/+1
2013-03-13mergetools/p4merge: create a base if none availableLibravatar Kevin Bracey1-1/+5
2013-03-13mergetools/p4merge: swap LOCAL and REMOTELibravatar Kevin Bracey1-1/+1
2013-02-14Merge branch 'da/p4merge-mktemp-fix'Libravatar Junio C Hamano1-1/+1
2013-02-10p4merge: fix printf usageLibravatar David Aguilar1-1/+1
2013-02-07Merge branch 'ss/mergetools-tortoise'Libravatar Junio C Hamano1-4/+21
2013-02-07Merge branch 'jk/mergetool'Libravatar Junio C Hamano5-32/+5
2013-02-01mergetools: teach tortoisemerge to handle filenames with SP correctlyLibravatar Sven Strickroth1-3/+11
2013-01-28mergetools: simplify how we handle "vim" and "defaults"Libravatar David Aguilar5-22/+3
2013-01-27mergetools/vim: remove redundant diff commandLibravatar David Aguilar1-10/+2
2013-01-26mergetools: support TortoiseGitMergeLibravatar Sven Strickroth1-1/+10
2012-12-26mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderLibravatar David Aguilar1-14/+13
2012-10-25Merge branch 'da/mergetools-p4'Libravatar Jeff King1-0/+25
2012-10-11mergetools/p4merge: Handle "/dev/null"Libravatar David Aguilar1-0/+25
2012-10-01Merge branch 'da/mergetool-custom'Libravatar Junio C Hamano1-26/+2
2012-09-25mergetool--lib: Allow custom commands to override built-insLibravatar David Aguilar1-26/+2
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsLibravatar Sebastian Schuberth1-0/+25
2012-03-05mergetools: add a plug-in to support DeltaWalkerLibravatar Tim Henigan1-0/+21
2012-02-14Merge branch 'jn/ancient-meld-support'Libravatar Junio C Hamano1-1/+1
2012-02-10mergetools/meld: Use --help output to detect --output supportLibravatar Jonathan Nieder1-1/+1
2011-10-15mergetools: use the correct tool for Beyond Compare 3 on WindowsLibravatar Pat Thoyts1-1/+6
2011-08-19mergetools/meld: Use '--output' when availableLibravatar David Aguilar1-1/+24
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar15-0/+306
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 21:27:14 +0000