comparison hgmerge @ 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 9c918287d10b
children 696851b1bba9
comparison
equal deleted inserted replaced
1235:5c0bd13bd771 1236:67a28636ea64