Merge branch 'pb/test-must-fail-is-for-git'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"