mergetools / vimdiff2on commit Merge branch 'sb/unpack-trees-cleanup' (0c0e0fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"