Merge branch 'rs/ref-update-check-errors-early'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"