mergetools / gvimdiff2on commit Merge branch 'jk/mailmap-incomplete-line' into maint (19230ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"