mergetools / vimdiff3on commit Merge branch 'jk/trailers-placeholder-in-pretty' (f008159)
   1. "$MERGE_TOOLS_DIR/vimdiff"