mergetools / gvimdiff2on commit add -p: improve error messages (4bdd6e7)
   1. "$MERGE_TOOLS_DIR/vimdiff"