mergetools / gvimdiffon commit Merge branch 'ap/commit-author-mailmap' into maint (87b24a4)
   1. "$MERGE_TOOLS_DIR/vimdiff"