annotate tests/test-symlink-root.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 cc8a52229620
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4086
cc8a52229620 Fix accessing the repo through a symlink.
Jun Inoue <jun.lambda@gmail.com>
parents:
diff changeset
1 ? foo
cc8a52229620 Fix accessing the repo through a symlink.
Jun Inoue <jun.lambda@gmail.com>
parents:
diff changeset
2 ? foo