Mercurial > hg
view tests/test-add.out @ 8749:69caf50da4a0
merge: refactor some initialization, drop backwards var
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | 32537b12e091 |
children | b9a8b616521d |
line wrap: on
line source
adding a ? a adding a A a A a ? b A a A b % should fail b already tracked! A a A b % should fail a already tracked! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon M a ? a.orig % should fail a already tracked! M a ? a.orig % issue683 R a ? a.orig M a ? a.orig c: No such file or directory d: No such file or directory M a A c ? a.orig