aboutsummaryrefslogtreecommitdiffstats
path: root/mergetools
AgeCommit message (Expand)AuthorFilesLines
2025-04-08Merge branch 'fr/vimdiff-layout-fixes'Junio C Hamano1-1/+13
2025-03-25mergetools: vimdiff: add tests for layout with REMOTE as the targetFernando Ramos1-1/+10
2025-03-25mergetools: vimdiff: fix layout where REMOTE is the targetFernando Ramos1-0/+3
2024-10-04Merge branch 'ak/typofix-2.46-maint'Junio C Hamano1-1/+1
2024-10-03mergetool: fix a typoAndrew Kreimer1-1/+1
2024-09-01mergetools: vscode: new toolAlex Henrie1-0/+19
2024-05-17Switch grep from non-portable BRE to portable EREMarcel Telka1-1/+1
2024-04-26vimdiff: make script and tests work with zshbrian m. carlson1-2/+1
2024-02-19mergetools: vimdiff: use correct tool's name when reading mergetool configKipras Melnikovas1-2/+10
2022-08-10mergetools: vimdiff: simplify tabfirstFelipe Contreras1-25/+19
2022-08-10mergetools: vimdiff: fix single window layoutsFelipe Contreras1-12/+8
2022-08-10mergetools: vimdiff: rework tab logicFelipe Contreras1-28/+22
2022-08-10mergetools: vimdiff: fix for diffoptFelipe Contreras1-18/+18
2022-08-10mergetools: vimdiff: silence annoying messagesFelipe Contreras1-2/+2
2022-08-10mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras1-18/+18
2022-08-10mergetools: vimdiff: fix commentFelipe Contreras1-2/+2
2022-07-27Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano1-18/+18
2022-07-27Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano1-4/+35
2022-07-14mergetool(vimdiff): allow paths to contain spaces againJohannes Schindelin1-4/+35
2022-07-08vimdiff: make layout engine more robust against user vim settingsFernando Ramos1-18/+18
2022-04-03mergetools: add description to all diff/merge toolsFernando Ramos20-0/+160
2022-04-03vimdiff: add tool documentationFernando Ramos1-0/+53
2022-03-30vimdiff: new implementation with layout supportFernando Ramos1-29/+529
2021-10-13mergetools/xxdiff: prevent segfaults from stopping difftoolDavid Aguilar1-0/+7
2021-06-08mergetools/kdiff3: make kdiff3 work on Windows tooMichael Schindler1-0/+9
2021-02-23mergetools/vimdiff: add vimdiff1 merge tool variantSeth House1-1/+12
2020-11-21Merge branch 'pd/mergetool-nvimdiff'Junio C Hamano1-0/+1
2020-11-11mergetools/bc: add `bc4` to the alias list for Beyond CompareJohannes Schindelin1-0/+1
2020-09-22Merge branch 'ls/mergetool-meld-auto-merge'Junio C Hamano1-16/+69
2020-09-16mergetool: allow auto-merge for meld to follow the vim-diff behaviorLin Sun1-16/+69
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha2-6/+10
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha7-5/+13
2019-04-04mergetools: add support for smerge (Sublime Merge)David Aguilar1-0/+12
2018-04-06mergetools: add support for guiffyBill Ritcher1-0/+18
2017-06-18mergetools/meld: improve compatibiilty with Meld on macOS XDavid Aguilar1-1/+1
2016-12-19Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano1-5/+5
2016-12-11mergetools: fix xxdiff hotkeysDavid Aguilar1-5/+5
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar1-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar19-27/+26
2016-04-04mergetools: add support for ExamDiffJacob Nisnevich1-0/+18
2016-04-04mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich1-20/+1
2016-02-12mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong1-2/+2
2015-05-20mergetools: add winmerge as a builtin toolDavid Aguilar1-0/+36
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar3-3/+0
2014-10-29Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano2-25/+26
2014-10-21mergetool: rename bc3 to bcJunio C Hamano2-25/+26
2014-10-16mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar1-2/+7
2014-04-22mergetools: add vimdiff3 modeFelipe Contreras3-2/+14
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen1-0/+15
2013-05-09Sync with v1.8.2.3Junio C Hamano1-1/+1
2013-05-09mergetools/kdiff3: do not use --auto when diffingDavid Aguilar1-1/+1
2013-03-13mergetools/p4merge: create a base if none availableKevin Bracey1-1/+5
2013-03-13mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey1-1/+1
2013-02-14Merge branch 'da/p4merge-mktemp-fix'Junio C Hamano1-1/+1
2013-02-10p4merge: fix printf usageDavid Aguilar1-1/+1
2013-02-07Merge branch 'ss/mergetools-tortoise'Junio C Hamano1-4/+21
2013-02-07Merge branch 'jk/mergetool'Junio C Hamano5-32/+5
2013-02-01mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth1-3/+11
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar5-22/+3
2013-01-27mergetools/vim: remove redundant diff commandDavid Aguilar1-10/+2
2013-01-26mergetools: support TortoiseGitMergeSven Strickroth1-1/+10
2012-12-26mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar1-14/+13
2012-10-25Merge branch 'da/mergetools-p4'Jeff King1-0/+25
2012-10-11mergetools/p4merge: Handle "/dev/null"David Aguilar1-0/+25
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano1-26/+2
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar1-26/+2
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth1-0/+25
2012-03-05mergetools: add a plug-in to support DeltaWalkerTim Henigan1-0/+21
2012-02-14Merge branch 'jn/ancient-meld-support'Junio C Hamano1-1/+1
2012-02-10mergetools/meld: Use --help output to detect --output supportJonathan Nieder1-1/+1
2011-10-15mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts1-1/+6
2011-08-19mergetools/meld: Use '--output' when availableDavid Aguilar1-1/+24
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar15-0/+306
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-06-04 09:11:17 +0000