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