diff tests/test-conflict @ 1236:67a28636ea64

Fix bug with co -C across branches, update tests
author mpm@selenic.com
date Tue, 13 Sep 2005 18:38:27 -0500
parents 0902ffece4b4
children c71420b186b0
line wrap: on
line diff