Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1636:7da32bb3d1d3
contrib: add Chris Mason's stand-alone diff tool
This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 24 Jan 2006 14:49:19 +1300 |
parents | db10b7114de0 |
children | 2da2d46862fb |
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 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