Merge branch 'ew/config-protect-mode'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"