Mercurial > hg
view tests/test-encode.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 | f5b00b6e426a |
children | a474f950357b |
line wrap: on
line source
%% no changes %% no changes %% uncompressed contents in repo this is a test %% uncompress our working dir copy this is a test 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% uncompress our new working dir copy this is a test %% check hg cat operation this is a test this is a test this is a test this is a test