How do I get BASE / REMOTE / LOCAL files without launching a mergetool GUI?...

Why can't I use TortoiseMerge as my git merge tool on Windows?...

git mergetool output is wrong...

git: no mergetool available...

What commands is required to revert changes made by git mergetool?...

git rebase confilcts merge issues...

Git: Confusion about merge algorithm, conflict format, and interplay with mergetools...

gvimdiff mergetool for msysgit...

git config mergetools - tfvc syntax documentation...

Vimdiff when running hg merge...

git - set KDiff3 as default mergetool...

`git mergetool`, A `fileName.~fileType` file was produced...

Git Extensions and Meld merge...

How to use git mergetool's filemerge...

How does git mergetool work to resolve conflicts?...

How to solve merge conflicts so that just two files are shown in meld...

git -- how to recover from unfinished merge...

git mergetool fails...

Is there a way to make Git mark a file as conflicted?...

Error mergetool code compare in git...

Git Mergtool: No files need merging + git status all conflicts fixed...

Why can't I configure an external difftool or mergetool for Git?...

Enable edit mode in 3-way diff using sublimerge...

git vimdiff mergetool basic commands?...

Can the LibreOffice / OpenOffice merge tool be used as `git-mergetool`?...

How to use Beyond Compare 3 as external SVN (SlikSVN) merge and diff tool on Windows?...

Resolve conflicts automatically with git-mergetool...

How to change merge mode for eclipse egit merge tool?...

'git mergetool' with meld fails creating a '--output $MERGED' file...

Problems using diffmerge mergetool with git...