git mergetool reports “No files need merging”

Question

For some reason lately, every time I pull and get a merge conflict, running git mergetool reports \"No files need merging\":

$ git pull
First, r         


        

Answer 1

This fixed it for me:
git mergetool .

I found this fix here