Harald Sitter on Twitter: "KDiff3 master as git mergetool? Yes, please! https://t.co/uSXXF6LYFv https://t.co/RsvUL6he9o" / Twitter
version control - Why does 'git mergetool' (meld) show conflict markers? - Stack Overflow
git - set KDiff3 as default mergetool - Stack Overflow
Git
How to use `git mergetool` to resolve conflicts in Vim / NeoVim · GitHub
Git Pro Tip: merge and diff made easier with GUI tools Meld and Atom - Linux Kamarada
Using VSCode as git mergetool and difftool | by Kenichi Shibata | FAUN Publication
Merge Conflicts — GitExtensions 3.4 documentation
version control - What's the best visual merge tool for Git? - Stack Overflow
Git Merge Deep Dive
git mergetool explained - YouTube
Using VSCode as git mergetool and difftool | by Kenichi Shibata | FAUN Publication
My favorite tools to resolve git merge conflicts | Xoxzo Official Blog
Resolving Conflicts with Git Mergetool - YouTube
13 Best visual merge tools for Git as of 2022 - Slant
Use p4merge from Perforce as default git mergetool | Dmitry Avtonomov
version control - What's the best visual merge tool for Git? - Stack Overflow
Fix merge conflicts in git with Meld – Mike's Software Blog
Merge Files with Git Merge Tool
How to use VS Code as your Git editor, difftool, and mergetool
Using a cool merge tool with SVN or GIT | Code Mode
Git for Windows tip: Use P4Merge as mergetool – danlimerick
git mergetool' with meld fails creating a '--output $MERGED' file - Stack Overflow
merge - What is the name of the default git mergetool? - Unix & Linux Stack Exchange
A better Vimdiff Git mergetool | Vim Tips Wiki | Fandom
