summaryrefslogtreecommitdiffstats
path: root/mergetools
AgeCommit message (Expand)AuthorLines
2025-06-06doc: update references to renamed AsciiDoc filesJouke Witteveen-2/+2
2025-04-08Merge branch 'fr/vimdiff-layout-fixes'Junio C Hamano-1/+13
2025-03-25mergetools: vimdiff: add tests for layout with REMOTE as the targetFernando Ramos-1/+10
2025-03-25mergetools: vimdiff: fix layout where REMOTE is the targetFernando Ramos-0/+3
2024-10-04Merge branch 'ak/typofix-2.46-maint'Junio C Hamano-1/+1
2024-10-03mergetool: fix a typoAndrew Kreimer-1/+1
2024-09-01mergetools: vscode: new toolAlex Henrie-0/+19
2024-05-17Switch grep from non-portable BRE to portable EREMarcel Telka-1/+1
2024-04-26vimdiff: make script and tests work with zshbrian m. carlson-2/+1
2024-02-19mergetools: vimdiff: use correct tool's name when reading mergetool configKipras Melnikovas-2/+10
2022-08-10mergetools: vimdiff: simplify tabfirstFelipe Contreras-25/+19
2022-08-10mergetools: vimdiff: fix single window layoutsFelipe Contreras-12/+8
2022-08-10mergetools: vimdiff: rework tab logicFelipe Contreras-28/+22
2022-08-10mergetools: vimdiff: fix for diffoptFelipe Contreras-18/+18
2022-08-10mergetools: vimdiff: silence annoying messagesFelipe Contreras-2/+2
2022-08-10mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras-18/+18
2022-08-10mergetools: vimdiff: fix commentFelipe Contreras-2/+2
2022-07-27Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano-18/+18
2022-07-27Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano-4/+35
2022-07-14mergetool(vimdiff): allow paths to contain spaces againJohannes Schindelin-4/+35
2022-07-08vimdiff: make layout engine more robust against user vim settingsFernando Ramos-18/+18
2022-04-03mergetools: add description to all diff/merge toolsFernando Ramos-0/+160
2022-04-03vimdiff: add tool documentationFernando Ramos-0/+53
2022-03-30vimdiff: new implementation with layout supportFernando Ramos-29/+529
2021-10-13mergetools/xxdiff: prevent segfaults from stopping difftoolDavid Aguilar-0/+7
2021-06-08mergetools/kdiff3: make kdiff3 work on Windows tooMichael Schindler-0/+9
2021-02-23mergetools/vimdiff: add vimdiff1 merge tool variantSeth House-1/+12
2020-11-21Merge branch 'pd/mergetool-nvimdiff'Junio C Hamano-0/+1
2020-11-11mergetools/bc: add `bc4` to the alias list for Beyond CompareJohannes Schindelin-0/+1
2020-09-22Merge branch 'ls/mergetool-meld-auto-merge'Junio C Hamano-16/+69
2020-09-16mergetool: allow auto-merge for meld to follow the vim-diff behaviorLin Sun-16/+69
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha-6/+10
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha-5/+13
2019-04-04mergetools: add support for smerge (Sublime Merge)David Aguilar-0/+12
2018-04-06mergetools: add support for guiffyBill Ritcher-0/+18
2017-06-18mergetools/meld: improve compatibiilty with Meld on macOS XDavid Aguilar-1/+1
2016-12-19Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano-5/+5
2016-12-11mergetools: fix xxdiff hotkeysDavid Aguilar-5/+5
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar-27/+26
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
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-15 10:29:20 +0000