view tests/test-symlink-os-yes-fs-no.py.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 24fd94ed1cc0
children a3d73b3e1f8a
line wrap: on
line source

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating working directory
4 files updated, 0 files merged, 0 files removed, 0 files unresolved