Merge branch 'tz/notes-error-to-stderr' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"