Mercurial > hg > mercurial-crew-with-dirclash
diff tests/fish-merge @ 147:b6d8ed7aeba0
A new ancestor algorithm
The old ancestor algorithm could get fooled into returning ancestors
closer to root than it ought to. Hopefully this one, which strictly
orders its search by distance from room, will be foolproof.
author | mpm@selenic.com |
---|---|
date | Tue, 24 May 2005 23:11:44 -0800 |
parents | 9f64ee817199 |
children | 3d4d5f2aba9a 4fc63e22b1fe |