global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-04 06:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ad60dddad72dfb8367bd695028b5b8dc6c33661b
git/mergetools
History
Junio C Hamano 0263e6bc03 Merge branch 'fr/vimdiff-layout-fix' into maint 
Recent update to vimdiff layout code has been made more robust
against different end-user vim settings.
source: <20220708181024.45839-1-greenfoo@u92.eu>

* fr/vimdiff-layout-fix:
  vimdiff: make layout engine more robust against user vim settings
2022-07-27 13:00:28 -07:00
..
araxis
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
bc
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
codecompare
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
deltawalker
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
diffmerge
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
diffuse
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
ecmerge
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
emerge
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
examdiff
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
guiffy
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
gvimdiff
mergetools: simplify how we handle "vim" and "defaults"
2013-01-28 19:00:38 -08:00
kdiff3
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
kompare
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
meld
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
nvimdiff
mergetools: add support for nvimdiff (neovim) family
2020-07-29 14:44:49 -07:00
opendiff
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
p4merge
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
smerge
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
tkdiff
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
tortoisemerge
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
vimdiff
Merge branch 'fr/vimdiff-layout-fix' into maint
2022-07-27 13:00:28 -07:00
winmerge
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00
xxdiff
mergetools: add description to all diff/merge tools
2022-04-03 15:10:04 -07:00