Mercurial > kallithea

diff rhodecode/lib/vcs/backends/hg/workdir.py @ 2543:03a770980b55 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Synced vcs with upstream
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 04 Jul 2012 11:42:16 +0200
parents 324ac367a4da
children 2b5f94fc3b7a
line wrap: on
line diff
--- a/rhodecode/lib/vcs/backends/hg/workdir.py	Tue Jul 03 03:27:48 2012 +0200
+++ b/rhodecode/lib/vcs/backends/hg/workdir.py	Wed Jul 04 11:42:16 2012 +0200
@@ -1,7 +1,7 @@
 from rhodecode.lib.vcs.backends.base import BaseWorkdir
 from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError
 
-from ...utils.hgcompat import hg_merge
+from rhodecode.lib.vcs.utils.hgcompat import hg_merge
 
 
 class MercurialWorkdir(BaseWorkdir):