Git
Open-source, decentralized version control system developed by Linus Torvalds.
(git-scm.com) Git website
ROAM_REFS: https://git-scm.com/
Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance. It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like cheap local branching, convenient staging areas, and multiple workflows.
(git-scm.com) Git - git-mergetool Documentation
ROAM_REFS: https://git-scm.com/docs/git-mergetool
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts DESCRIPTION Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge. If one or more <file> parameters are given, the merge tool program will be run to resolve differences in each file (skipping those without conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, git mergetool will run the merge tool program on every file with merge conflicts.