mergetools / gvimdiffon commit unpack-trees: improve loading of .gitmodules (3302871)
   1. "$MERGE_TOOLS_DIR/vimdiff"