mergetools / gvimdiff3on commit Merge branch 'ps/submodule-sanitize-path-upon-add' into maint (3630be2)
   1. "$MERGE_TOOLS_DIR/vimdiff"