mergetools / gvimdiff2on commit unpack-trees.c: align submodule error message to the other error messages (6362ed0)
   1. "$MERGE_TOOLS_DIR/vimdiff"