Merge branch 'cb/filter-branch-prune-empty-degenerate-merges'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"