view tests/test-convert-bzr-114.out @ 12317:ed639917c825 stable

test-eol-update: record new results as correct

Changeset 0852da25a31b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.

Previously, it used the .hgeol contents from the working directory before the
update.

% replace file with dir
initializing destination source-hg repository
scanning source...
sorting...
converting...
2 add d file
1 replace with d dir
0 add d/a
% manifest of tip
644   d/a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved