comparison tests/test-addremove @ 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 f975e986b4bf
children 627399330c7d
comparison
equal deleted inserted replaced
7820:346fafc144fc 7821:9fe7e6acf525