mergetools / vimdiff2on commit Merge branch 'jt/use-trailer-api-in-commands' (6ebfa10)
   1. "$MERGE_TOOLS_DIR/vimdiff"