Merge branch 'mh/clear-topo-walk-upon-reset'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"