mergetools / gvimdiff2on commit Merge branch 'ms/submodule-update-config-doc' (a11c508)
   1. "$MERGE_TOOLS_DIR/vimdiff"