view tests/test-hgk.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents cc7114d96548
children
line wrap: on
line source

adding a
tree a0c8bcbbb45c
parent 000000000000
author test 0 0
committer test 0 0
revision 0
branch default

adda