mergetools / vimdiff2on commit Merge branch 'pb/trailers-from-command-line' (bfd91b4)
   1. "$MERGE_TOOLS_DIR/vimdiff"