mergetools / gvimdiff3on commit grammofix in user-facing messages (ad5fe37)
   1. "$MERGE_TOOLS_DIR/vimdiff"