view tests/test-empty.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 7e5f3480c45b
children a3d73b3e1f8a
line wrap: on
line source

checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
00changelog.i
requires
store
updating working directory
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
00changelog.i
branch
dirstate
hgrc
requires
store