Merge branch 'rs/use-skip-prefix-more'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"