diff tests/test-merge1.out @ 3216:5b7ed414affb

Add hg.LookupError
author Brendan Cully <brendan@kublai.com>
date Sun, 01 Oct 2006 11:58:55 -0700
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff