Mercurial > hg
view tests/test-encode.out @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 02:59:13 -0500 |
parents | b2ae81a7df29 |
children | f5b00b6e426a |
line wrap: on
line source
%% no changes %% no changes %% uncompressed contents in repo this is a test %% uncompress our working dir copy this is a test 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% uncompress our new working dir copy this is a test