Merge branch 'mb/reword-autocomplete-message' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"