mergetools / gvimdiff2on commit Merge branch 'hv/mv-nested-submodules-test' into next (d36650b)
   1. "$MERGE_TOOLS_DIR/vimdiff"