view tests/test-mq-qrename.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 05a682c8907d
children 0c944b7af564
line wrap: on
line source

adding base
foo/renamed
renamed
bar/renamed
renamed
baz
.hg/patches/baz
% test patch being renamed before committed