mergetools / gvimdiff2on commit fetch: improve the error messages emitted for conflicting refspecs (f096e6e)
   1. "$MERGE_TOOLS_DIR/vimdiff"