mergetools / gvimdiff2on commit unpack-trees: oneway_merge to update submodules (ad17312)
   1. "$MERGE_TOOLS_DIR/vimdiff"