mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
4aff18a3f0
The 'meld' backend of the "git mergetool" learned to give the underlying 'meld' the '--auto-merge' option, which would help reduce the amount of text that requires manual merging. * ls/mergetool-meld-auto-merge: mergetool: allow auto-merge for meld to follow the vim-diff behavior |
||
---|---|---|
.. | ||
araxis | ||
bc | ||
codecompare | ||
deltawalker | ||
diffmerge | ||
diffuse | ||
ecmerge | ||
emerge | ||
examdiff | ||
guiffy | ||
gvimdiff | ||
kdiff3 | ||
kompare | ||
meld | ||
nvimdiff | ||
opendiff | ||
p4merge | ||
smerge | ||
tkdiff | ||
tortoisemerge | ||
vimdiff | ||
winmerge | ||
xxdiff |