diff tests/fish-merge @ 45:f2b2d5daec30

Fix recursion depth trouble with ancestor algorithm
author mpm@selenic.com
date Tue, 10 May 2005 00:34:57 -0800
parents 9f64ee817199
children 3d4d5f2aba9a 4fc63e22b1fe
line wrap: on
line diff