diff tests/test-merge1.out @ 5402:ad0b580cad35

mercurial_sink: regrab locks in setbranch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 06 Oct 2007 15:30:15 -0300
parents 3109f012c305
children 840e2b315c1f
line wrap: on
line diff