diff tests/test-bad-pull @ 3071:547d1a4aa105

hg merge: fix lookup of branch add some tests for branch usage
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 08 Sep 2006 02:16:16 +0200
parents d22d730c96ed
children 7012c889e8f2
line wrap: on
line diff