Merge branch 'ss/commit-squash-msg' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"