git checkout --ours/--theirs after git merge-files with external files...

Is it possible to change VSCode 3-way merge editor layout?...

Programmatically make use of eclipse's merge and diff viewers...

Diff between 2 git commits except contained in 3rd commit...

How to automatically put a file as resolved after merge...

How does the 3 way merge in Mercurial/Meld work?...

Why does 'git mergetool' (meld) show conflict markers?...

Understanding Meld 3 way merge with Git...

Skip undo step in Vim...

Can I diff more than one file at a time using subversion and Beyond Compare?...

Mercurial Workflow for small team...