view tests/test-1102.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 938eddd76237
children
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
tip                                3:a49829c4fc11
t1                                 0:f7b1eb17ad24