Merge branch 'sb/parseopt-boolean-removal'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"