view tests/test-encode.out @ 1664:4338e33c973b

Safer version of FileMerge merge
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Jan 2006 12:02:12 +1300
parents 1945754e466b
children b2ae81a7df29
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
%% uncompress our new working dir copy
this is a test