view tests/test-merge5.out @ 5326:319c09685f30

dirstate: make dir collision logic faster - shortcircuit decpath if we haven't built the _dirs map - increment only for leafnodes of directory tree (this should make construction more like O(nlog n) than O(n^2))
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Sep 2007 12:36:38 -0500
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes