summaryrefslogtreecommitdiff
path: root/mergetools
Commit message (Expand)AuthorAgeFilesLines
* mergetools/kdiff3: make kdiff3 work on Windows tooMichael Schindler2021-06-081-0/+9
* mergetools/vimdiff: add vimdiff1 merge tool variantSeth House2021-02-231-1/+12
* Merge branch 'pd/mergetool-nvimdiff'Junio C Hamano2020-11-211-0/+1
|\
| * mergetools/bc: add `bc4` to the alias list for Beyond CompareJohannes Schindelin2020-11-111-0/+1
* | Merge branch 'ls/mergetool-meld-auto-merge'Junio C Hamano2020-09-221-16/+69
|\ \ | |/ |/|
| * mergetool: allow auto-merge for meld to follow the vim-diff behaviorLin Sun2020-09-161-16/+69
* | mergetools: add support for nvimdiff (neovim) familypudinha2020-07-292-6/+10
* | mergetool--lib: improve support for vimdiff-style tool variantspudinha2020-07-297-5/+13
|/
* mergetools: add support for smerge (Sublime Merge)David Aguilar2019-04-041-0/+12
* mergetools: add support for guiffyBill Ritcher2018-04-061-0/+18
* mergetools/meld: improve compatibiilty with Meld on macOS Xda/mergetools-meld-output-opt-on-macosDavid Aguilar2017-06-181-1/+1
* Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano2016-12-191-5/+5
|\
| * mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkeyDavid Aguilar2016-12-111-5/+5
* | mergetools/vimdiff: trust Vim's exit codeda/mergetool-trust-exit-codeDavid Aguilar2016-11-291-0/+4
* | mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-2919-27/+26
|/
* mergetools: add support for ExamDiffjn/mergetools-examdiffJacob Nisnevich2016-04-041-0/+18
* mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-041-20/+1
* mergetool: reorder vim/gvim buffers in three-way diffsdw/mergetool-vim-window-shuffleDickson Wong2016-02-121-2/+2
* mergetools: add winmerge as a builtin toolDavid Aguilar2015-05-201-0/+36
* mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-statusDavid Aguilar2014-11-213-3/+0
* Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano2014-10-292-25/+26
|\
| * mergetool: rename bc3 to bcoc/mergetools-beyondcompareJunio C Hamano2014-10-212-25/+26
* | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-161-2/+7
|/
* mergetools: add vimdiff3 modefc/mergetools-vimdiff3Felipe Contreras2014-04-223-2/+14
* mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-131-0/+15
* Sync with v1.8.2.3Junio C Hamano2013-05-091-1/+1
|\
| * mergetools/kdiff3: do not use --auto when diffingDavid Aguilar2013-05-091-1/+1
* | mergetools/p4merge: create a base if none availableKevin Bracey2013-03-131-1/+5
* | mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey2013-03-131-1/+1
|/
* Merge branch 'da/p4merge-mktemp-fix'Junio C Hamano2013-02-141-1/+1
|\
| * p4merge: fix printf usageDavid Aguilar2013-02-101-1/+1
* | Merge branch 'ss/mergetools-tortoise'Junio C Hamano2013-02-071-4/+21
|\ \
| * | mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth2013-02-011-3/+11
| * | mergetools: support TortoiseGitMergeSven Strickroth2013-01-261-1/+10
* | | Merge branch 'jk/mergetool'Junio C Hamano2013-02-075-32/+5
|\ \ \ | |_|/ |/| |
| * | mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-285-22/+3
| * | mergetools/vim: remove redundant diff commandDavid Aguilar2013-01-271-10/+2
* | | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar2012-12-261-14/+13
| |/ |/|
* | Merge branch 'da/mergetools-p4'Jeff King2012-10-251-0/+25
|\ \ | |/ |/|
| * mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-111-0/+25
* | Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-011-26/+2
|\ \
| * | mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-251-26/+2
| |/
* | Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-101-0/+25
|/
* mergetools: add a plug-in to support DeltaWalkerTim Henigan2012-03-051-0/+21
* Merge branch 'jn/ancient-meld-support'Junio C Hamano2012-02-141-1/+1
|\
| * mergetools/meld: Use --help output to detect --output supportjn/ancient-meld-supportJonathan Nieder2012-02-101-1/+1
* | mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts2011-10-151-1/+6
|/
* mergetools/meld: Use '--output' when availableDavid Aguilar2011-08-191-1/+24
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-1915-0/+306
View Lorry Controller Status