For some reason lately, every time I pull and get a merge conflict, running git mergetool reports \"No files need merging\":
git mergetool
$ git pull First, r
Could it be that you must first run merge? Then if there are merge conflicts to resolve, you can run mergetool. But until there are created as the results of an incomplete merge, I think mergetool will simply report there is nothing to merge.