mergetools / gvimdiffon commit Merge branch 'os/no-verify-skips-commit-msg-too' into maint (d9d7ab3)
   1. "$MERGE_TOOLS_DIR/vimdiff"