# HG changeset patch # User Brendan Cully # Date 1187031527 25200 # Node ID ec24bfd852aba2d77d2478e5a8d30a841c39ae5e # Parent 1d5ebb0d366fdfa1fc353dfcd1f25e0254e06a55 imerge: simplify 1d5ebb0d366f diff --git a/hgext/imerge.py b/hgext/imerge.py --- a/hgext/imerge.py +++ b/hgext/imerge.py @@ -36,7 +36,7 @@ class ImergeStateFile(object): tf = tarfile.open(source, 'r') contents = tf.getnames() # tarfile normalizes path separators to '/' - statusfile = '/'.join(['.hg', 'imerge', 'status']) + statusfile = '.hg/imerge/status' if statusfile not in contents: raise InvalidStateFileException('no status file')