git: mergetool outputs 'No files need merging' while git rerere enabled
When rerere (reuse recorded resolution) is enabled in git, it records how you resolve conflicts and applies recorded resolutions upon same conflicts.
I was trying different merge tools and using the s...