view tests/test-merge1.out @ 2124:27fd8b7a6c51

Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Tue, 25 Apr 2006 00:43:40 +0200
parents 2da2d46862fb
children b2ae81a7df29
line wrap: on
line source

%% 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 uncommitted changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
abort: outstanding uncommitted changes
%% merge of b expected
merging for b
merging b