mergetools / gvimdiff3on commit refs: make error messages more consistent (0568c8e)
   1. "$MERGE_TOOLS_DIR/vimdiff"