- 34133d9 mergetools: vimdiff: simplify tabfirst by Felipe Contreras · 2 years, 7 months ago
- b6014ee mergetools: vimdiff: fix single window layouts by Felipe Contreras · 2 years, 7 months ago
- ffcc33f mergetools: vimdiff: rework tab logic by Felipe Contreras · 2 years, 7 months ago
- 60184ab mergetools: vimdiff: fix for diffopt by Felipe Contreras · 2 years, 7 months ago
- 66dd83a mergetools: vimdiff: silence annoying messages by Felipe Contreras · 2 years, 7 months ago
- 79db50d mergetools: vimdiff: make vimdiff3 actually work by Felipe Contreras · 2 years, 7 months ago
- d619183 mergetools: vimdiff: fix comment by Felipe Contreras · 2 years, 7 months ago
- 0263e6b Merge branch 'fr/vimdiff-layout-fix' into maint by Junio C Hamano · 2 years, 8 months ago
- 57fe0df Merge branch 'js/vimdiff-quotepath-fix' into maint by Junio C Hamano · 2 years, 8 months ago
- ccc7b51 mergetool(vimdiff): allow paths to contain spaces again by Johannes Schindelin · 2 years, 8 months ago
- f3d7623 vimdiff: make layout engine more robust against user vim settings by Fernando Ramos · 2 years, 8 months ago
- 980145f mergetools: add description to all diff/merge tools by Fernando Ramos · 3 years ago
- 7b5cf8b vimdiff: add tool documentation by Fernando Ramos · 3 years ago
- 0041797 vimdiff: new implementation with layout support by Fernando Ramos · 3 years ago
- 571f434 mergetools/xxdiff: prevent segfaults from stopping difftool by David Aguilar · 3 years, 5 months ago
- 47eb4c6 mergetools/kdiff3: make kdiff3 work on Windows too by Michael Schindler · 3 years, 9 months ago
- 30bb808 mergetools/vimdiff: add vimdiff1 merge tool variant by Seth House · 4 years, 1 month ago
- d203add Merge branch 'pd/mergetool-nvimdiff' by Junio C Hamano · 4 years, 4 months ago
- 6bc9082 mergetools/bc: add `bc4` to the alias list for Beyond Compare by Johannes Schindelin · 4 years, 4 months ago
- 4aff18a Merge branch 'ls/mergetool-meld-auto-merge' by Junio C Hamano · 4 years, 6 months ago
- dbd8c09 mergetool: allow auto-merge for meld to follow the vim-diff behavior by Lin Sun · 4 years, 10 months ago
- 1186897 mergetools: add support for nvimdiff (neovim) family by pudinha · 4 years, 8 months ago
- 83bbf9b mergetool--lib: improve support for vimdiff-style tool variants by pudinha · 4 years, 8 months ago
- eb12adc mergetools: add support for smerge (Sublime Merge) by David Aguilar · 6 years ago
- 6ceb658 mergetools: add support for guiffy by Bill Ritcher · 7 years ago
- 0af85f8 mergetools/meld: improve compatibiilty with Meld on macOS X by David Aguilar · 8 years ago
- a3c9887 Merge branch 'da/mergetool-xxdiff-hotkey' by Junio C Hamano · 8 years ago
- 6cf5f6c mergetools: fix xxdiff hotkeys by David Aguilar · 8 years ago
- 2967284 mergetools/vimdiff: trust Vim's exit code by David Aguilar · 8 years ago
- 7c10605 mergetool: honor mergetool.$tool.trustExitCode for built-in tools by David Aguilar · 8 years ago
- 35d62bb mergetools: add support for ExamDiff by Jacob Nisnevich · 9 years ago
- e36d716 mergetools: create mergetool_find_win32_cmd() helper function for winmerge by Jacob Nisnevich · 9 years ago
- 2300328 mergetool: reorder vim/gvim buffers in three-way diffs by Dickson Wong · 9 years ago
- 3e4f237 mergetools: add winmerge as a builtin tool by David Aguilar · 10 years ago
- 1e86d5b mergetools: stop setting $status in merge_cmd() by David Aguilar · 10 years ago
- c1777a2 Merge branch 'oc/mergetools-beyondcompare' by Junio C Hamano · 10 years ago
- f13f9b0 mergetool: rename bc3 to bc by Junio C Hamano · 10 years ago
- b12d045 mergetools/meld: make usage of `--output` configurable and more robust by David Aguilar · 10 years ago
- 7c147b7 mergetools: add vimdiff3 mode by Felipe Contreras · 11 years ago
- c5f424f mergetools/diffmerge: support DiffMerge as a git mergetool by Stefan Saasen · 11 years ago
- b387c77 Sync with v1.8.2.3 by Junio C Hamano · 12 years ago
- e2161bc mergetools/kdiff3: do not use --auto when diffing by David Aguilar · 12 years ago
- 4549162 mergetools/p4merge: create a base if none available by Kevin Bracey · 12 years ago
- c699a7c mergetools/p4merge: swap LOCAL and REMOTE by Kevin Bracey · 12 years ago
- c0acef9 Merge branch 'da/p4merge-mktemp-fix' by Junio C Hamano · 12 years ago
- d272c84 p4merge: fix printf usage by David Aguilar · 12 years ago
- eeaf4e7 Merge branch 'ss/mergetools-tortoise' by Junio C Hamano · 12 years ago
- 55f56fe Merge branch 'jk/mergetool' by Junio C Hamano · 12 years ago
- 81ed7b9 mergetools: teach tortoisemerge to handle filenames with SP correctly by Sven Strickroth · 12 years ago
- 073678b mergetools: simplify how we handle "vim" and "defaults" by David Aguilar · 12 years ago
- b2a6b71 mergetools/vim: remove redundant diff command by David Aguilar · 12 years ago
- 8bf6719 mergetools: support TortoiseGitMerge by Sven Strickroth · 12 years ago
- 950b568 mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder by David Aguilar · 12 years ago
- 33d3c6b Merge branch 'da/mergetools-p4' by Jeff King · 12 years ago
- 3facc60 mergetools/p4merge: Handle "/dev/null" by David Aguilar · 12 years ago
- 5ec11ab Merge branch 'da/mergetool-custom' by Junio C Hamano · 12 years ago
- a427ef7 mergetool--lib: Allow custom commands to override built-ins by David Aguilar · 12 years ago
- 755e8b3 Add Code Compare v2.80.4 as a merge / diff tool for Windows by Sebastian Schuberth · 13 years ago
- 284a126 mergetools: add a plug-in to support DeltaWalker by Tim Henigan · 13 years ago
- 746b6fb Merge branch 'jn/ancient-meld-support' by Junio C Hamano · 13 years ago
- 759a904 mergetools/meld: Use --help output to detect --output support by Jonathan Nieder · 13 years ago
- 8850c3d mergetools: use the correct tool for Beyond Compare 3 on Windows by Pat Thoyts · 13 years ago
- f61bd9c mergetools/meld: Use '--output' when available by David Aguilar · 14 years ago
- bc7a96a mergetool--lib: Refactor tools into separate files by David Aguilar · 14 years ago
