mergetools / vimdiff3on commit Merge branch 'jc/submitting-patches-mention-send-email' into maint (a5d3154)
   1. "$MERGE_TOOLS_DIR/vimdiff"