| .. |
|
araxis
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
bc
|
83bbf9b92e
mergetool--lib: improve support for vimdiff-style tool variants
|
5 年之前 |
|
codecompare
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
deltawalker
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
diffmerge
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
diffuse
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
ecmerge
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
emerge
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
examdiff
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
guiffy
|
6ceb658c99
mergetools: add support for guiffy
|
7 年之前 |
|
gvimdiff
|
073678b8e6
mergetools: simplify how we handle "vim" and "defaults"
|
12 年之前 |
|
kdiff3
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
kompare
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
meld
|
dbd8c09bfe
mergetool: allow auto-merge for meld to follow the vim-diff behavior
|
4 年之前 |
|
nvimdiff
|
11868978c7
mergetools: add support for nvimdiff (neovim) family
|
5 年之前 |
|
opendiff
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
p4merge
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
smerge
|
eb12adc74c
mergetools: add support for smerge (Sublime Merge)
|
6 年之前 |
|
tkdiff
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
tortoisemerge
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
vimdiff
|
11868978c7
mergetools: add support for nvimdiff (neovim) family
|
5 年之前 |
|
winmerge
|
7c10605d2c
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
|
8 年之前 |
|
xxdiff
|
a3c988727d
Merge branch 'da/mergetool-xxdiff-hotkey'
|
8 年之前 |
Junio C Hamano
4aff18a3f0
Merge branch 'ls/mergetool-meld-auto-merge'