Mercurial > hg
view tests/test-issue619.out @ 11710:58a038605a2b stable
merge crew and main
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sat, 31 Jul 2010 11:04:33 +0900 |
parents | 6f1d1ed3e19a |
children |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: merging with a working directory ancestor has no effect done