Merge branch 'lc/filter-branch-too-many-refs'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"