mergetools / vimdiff3on commit Merge branch 'cb/byte-order' (83a4904)
   1. "$MERGE_TOOLS_DIR/vimdiff"