[version-control] What's the best three-way merge tool?

Examples related to version-control

• How can I switch to another branch in git? • Do I commit the package-lock.json file created by npm 5? • Project vs Repository in GitHub • Remove a modified file from pull request • Git push: "fatal 'origin' does not appear to be a git repository - fatal Could not read from remote repository." • Git: How to squash all commits on branch • git: updates were rejected because the remote contains work that you do not have locally • Sourcetree - undo unpushed commits • Cannot checkout, file is unmerged • Git diff between current branch and master but not including unmerged master commits

Examples related to merge

• Pandas Merging 101 • Python: pandas merge multiple dataframes • Git merge with force overwrite • Merge two dataframes by index • Visual Studio Code how to resolve merge conflicts with git? • merge one local branch into another local branch • Merging dataframes on index with pandas • Git merge is not possible because I have unmerged files • Git merge develop into feature branch outputs "Already up-to-date" while it's not • How merge two objects array in angularjs?

Examples related to dvcs

• Pushing to Git returning Error Code 403 fatal: HTTP request failed • Git push won't do anything (everything up-to-date) • Mercurial — revert back to old version and continue from there • How do I show the changes which have been staged? • How can I stop .gitignore from appearing in the list of untracked files? • Undo working copy modifications of one file in Git? • What's the best three-way merge tool? • What is the Difference Between Mercurial and Git?