mergetools / vimdiff3on commit submodule.c: report the submodule that an error occurs in (ba95d4e)
   1. "$MERGE_TOOLS_DIR/vimdiff"