Mercurial > hg
view tests/test-merge2.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 | 4b0c9c674707 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b created new head