Git Mergetool No Files Need Merging