mergetools / vimdiff3on commit Merge branch 'jk/trailers-use-config' (3a50607)
   1. "$MERGE_TOOLS_DIR/vimdiff"