mergetools / gvimdiff3on commit Merge branch 'ps/submodule-sanitize-path-upon-add' (070f6fe)
   1. "$MERGE_TOOLS_DIR/vimdiff"