Mercurial > hg
view tests/test-issue619.out @ 11453:2ee26044d846 stable
context: allow passing the common cset ancestor to fctx.ancestor
This is used by the next patch to speed up merge.applyupdates.
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Fri, 18 Jun 2010 08:48:05 +0200 |
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