view tests/test-mq-symlinks.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 fb32ae9c76e7
children 561ff8d9e4f0 ea1935e2020a
line wrap: on
line source

a -> a not a symlink
a -> b
now at: base.patch
applying symlink.patch
now at: symlink.patch
a -> b
now at: symlink.patch
applying removesl.patch
now at: removesl.patch
C b