Merge branch 'ad/submitting-patches-title-decoration' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"