Meld-flavored side-by-side diff & merge in a Chrome app window. Vanilla JS, no build step — the Go binary is the running git mergetool: pick ours/theirs/both per conflict, it writes the file back and exits.
Make resolving merge conflicts in Neovim a breeze.
Implementation of beginner to advanced concepts of git and GitHub.
A repository created as part of a school assignment on Git & Github that contains ~4 jobs.
Add a description, image, and links to the git-mergetool topic page so that developers can more easily learn about it.
To associate your repository with the git-mergetool topic, visit your repo's landing page and select "manage topics."