mergetools / gvimdiff2on commit Merge branch 'sb/mv-submodule-fix' into HEAD (920f2ea)
   1. "$MERGE_TOOLS_DIR/vimdiff"