Mercurial > hg
view tests/test-hardlinks-safety.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | fb32ae9c76e7 |
children | 14639c050251 |
line wrap: on
line source
% no diff if hardlink % init adding foo to series file applying foo now at: foo adding bar to series file applying bar now at: bar 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar % foo bar %%% 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo % foo %%% 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo 430ed4828a74fa4047bc816a25500f7472ab4bfe bar % 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo 430ed4828a74fa4047bc816a25500f7472ab4bfe lbar %%% 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo % 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo