Unconflict
Mergetool specifically for single git conflict files
...WinMerge is a good mergetool for resolving conflicts in files you're merging in git, but when resolving conflicts in conflict files, it only allows changes in "your" file, negating much of its usefulness. Unconflict helps you remove conflicts from git conflict files without losing data.