mergetools / gvimdiff2on commit git-merge-one-file: style cleanup (333ea38)
   1. "$MERGE_TOOLS_DIR/vimdiff"