mergetool topic
List
mergetool repositories
diffconflicts
380
Stars
19
Forks
Watchers
A better Vimdiff Git mergetool
vim-mergetool
282
Stars
15
Forks
Watchers
:cake: Efficient way of using Vim as a Git mergetool
nbdime
2.6k
Stars
157
Forks
Watchers
Tools for diffing and merging of Jupyter notebooks.
kakmerge
35
Stars
4
Forks
Watchers
A Kakoune-based mergetool for Git
intellij-merge-tool
16
Stars
2
Forks
Watchers
VS Code extension for open merge tool of intellij