view tests/test-encode.out @ 5340:ad8783fe20f7

darcs2hg: Now detects and recovers from simple darcs conflicts.
author Terry Smith <terry@t11e.com>
date Tue, 11 Sep 2007 13:13:54 -0400
parents b2ae81a7df29
children
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