view tests/test-custom-filters.out @ 6298:53cbb33e1269

normallookup: during merges, restore the state saved by remove
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 18 Mar 2008 04:07:39 -0300
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