Mercurial > hg
view tests/test-merge5.out @ 10894:26cf11f9f322
keyword: make the templater a local variable
After 6722ba3bf80b a class attribute makes no sense.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Mon, 12 Apr 2010 17:34:12 +0200 |
parents | 68a1b9d0663e |
children |
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' to merge or use 'hg update -C' to discard changes) % should succeed 1 files updated, 0 files merged, 0 files removed, 0 files unresolved