Merge branch 'mg/commit-author-no-match-malformed-message'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"