Mercurial > hg
view tests/test-merge5.out @ 9637:64425c5a9257
cmdutil: minor refactoring of changeset_printer._show
- use ctx.branch() instead of directly accessing the extra field "branch"
- move definitions of locals ('extra' and 'branch') down to where they
are used
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sat, 24 Oct 2009 19:01:40 +0200 |
| parents | 0b89315d5de2 |
| children | 68a1b9d0663e |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b created new head % should abort abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes) % should succeed abort: crosses branches (use 'hg merge' or 'hg update -C')