Mercurial > hg
view tests/test-merge5.out @ 10151:c7355a0e1f39
patch: make git diffline generation more explicit
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 29 Dec 2009 16:00:38 +0100 |
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