Better tool for managing git merge conflicts ssh and windows...

Git merge --theirs ALL files EXCEPT the ones that have been edited by <name>, <name>, or...

How can I see the list of available merge tools for git on the command line?...

How to configure my mergetool to not show conflict markers?...

git cherry-pick: how consider only lines modified by the commit (i.e., not the surrounding context)?...

How to make git mergetool aware of diff markers...

Amending a git mergetool job...

Git mergetool on Windows keeps being given filepath from Git install rather than repository root...

git: update a php-script but keep own changes...

Git: configure patterns for difftool and mergetool...

How to change location of backup files left by failed git mergetool...

View full file diff of `x` commits of a single file's history (that's hosted in git)...

Eclipse as git mergetool?...

Can I rename LOCAL, REMOTE and BASE as used in git mergetool?...

Git & WinMerge (msysgit)...

Merge changes when a file on a branch has split into two files on the master...