tests/test-encode.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Mon, 06 Feb 2006 17:32:00 -0600
changeset 1699 83e8cd97b9f9
parent 1258 1945754e466b
child 2175 b2ae81a7df29
permissions -rw-r--r--
hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

%% 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