Mercurial > hg
view tests/test-merge9.out @ 6914:95f35b553ae6
hgweb: removed unnecessary del before function return
Deleting tmpl just before the return statement should have no effect
since tmpl goes out of scope anyway. But it confuses pyflakes who
thinks tmpl is undefined when it is used in the except blocks below.
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Sat, 16 Aug 2008 16:32:57 +0200 |
parents | 92ccccb55ba3 |
children | 5a14a8f3b909 |
line wrap: on
line source
adding bar adding foo adding quux1 adding quux2 created new head merging bar merging bar failed! merging foo and baz to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges U bar R baz 3 files updated, 0 files merged, 1 files removed, 0 files unresolved merging bar merging bar failed! merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges % show unresolved U bar R baz % unmark baz % show U bar U baz % re-resolve baz merging baz and foo to baz % after U bar R baz % resolve all merging bar warning: conflicts during merge. merging bar failed! % after U bar R baz