view tests/test-encode.out @ 4264:bda63383d529

Make import opportunistically use merge information
author Brendan Cully <brendan@kublai.com>
date Wed, 21 Mar 2007 14:06:25 -0700
parents b2ae81a7df29
children f5b00b6e426a
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