changeset 490 | 8096833e9226 |
parent 489 | fdf3ae486e01 |
child 491 | 6989d8fe4ed2 |
--- a/hgext/obsolete.py Thu Aug 23 18:19:42 2012 +0200 +++ b/hgext/obsolete.py Thu Aug 23 18:21:18 2012 +0200 @@ -58,11 +58,11 @@ from mercurial import error from mercurial import extensions from mercurial import localrepo +from mercurial import merge from mercurial import phases from mercurial import revset from mercurial import scmutil from mercurial import templatekw -from mercurial import merge from mercurial.node import bin, short, nullid # This extension contains the following code