mergetools / gvimdiff2on commit Merge branch 'sb/submodule-module-list-fix' (03f682b)
   1. "$MERGE_TOOLS_DIR/vimdiff"