Mercurial > hg
changeset 17406:fc14953e8e34
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 28 Aug 2012 17:59:08 -0500 |
parents | 81b115385bc7 (current diff) b0aad9fb87f9 (diff) |
children | 31c123a2f273 e7cfe3587ea4 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/obsolete.py Tue Aug 28 20:57:11 2012 +0200 +++ b/mercurial/obsolete.py Tue Aug 28 17:59:08 2012 -0500 @@ -52,7 +52,7 @@ cannot contain '\0'. """ import struct -from mercurial import util, base85 +import util, base85 from i18n import _ # the obsolete feature is not mature enought to be enabled by default.