view tests/test-custom-filters.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 f3a8b5360100
children
line wrap: on
line source

% Repository data:
Some stuff to ponder very carefully.
% Fresh checkout:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Copyright 2046, The Masters
Some stuff to ponder very carefully.
M stuff.txt
% Problem encoding:
abort: missing header "Copyright 2046, The Masters" in morestuff.txt
M stuff.txt
A morestuff.txt