Merge branch 'dk/skip-prefix-scan-only-once'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"