Merge branch 'wk/man-deny-current-branch-is-default-these-days'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"