Mercurial > hg
view tests/test-merge1.out @ 2158:ec96c4518236
add backout command.
command undoes effect of an earlier commit, commits new changeset
as result.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sat, 29 Apr 2006 20:56:46 -0700 |
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