tests/test-merge1.out

many small changes to templater.

get string code to parse escapes. uses eval now, should parse strings
itself soon.

let caller check if fragment is defined using "in".

make templatepath take optional file name.

%% no merges expected
%% merge should fail
abort: 'b' already exists in the working dir and differs from remote
%% merge of b expected
merging for b
merging b
%%
Contents of b should be "this is file b1"
This is file b1
%% merge fails
abort: outstanding uncommited changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
abort: outstanding uncommited changes
%% merge of b expected
merging for b
merging b