Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/whiteinge/diffconflicts
A better Vimdiff Git mergetool
git mergetool vim vim-plugin vimdiff
Last synced: 03 Jul 2024
https://github.com/samoshkin/vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool
diff git merge-conflicts mergetool vim vim-plugin vimdiff
Last synced: 15 Jun 2024
https://github.com/jupyter/nbdime
Tools for diffing and merging of Jupyter notebooks.
diff diffing git hg jupyter jupyter-notebook jupyterlab-extension mercurial merge merge-driver mergetool vcs version-control
Last synced: 08 May 2024
