mergetools / vimdiff2on commit Merge branch 'mh/simplify-cache-tree-find' (da2e057)
   1. "$MERGE_TOOLS_DIR/vimdiff"