mergetools / gvimdiff2on commit Merge branch 'jt/use-trailer-api-in-commands' into maint (e2ae5ec)
   1. "$MERGE_TOOLS_DIR/vimdiff"