Mercurial > hg
diff hgext/eol.py @ 20870:6500a2eebee8
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Apr 2014 15:11:19 -0500 |
parents | 49f2d5644f04 9658a79968c6 |
children | fb3e63c603e8 |
line wrap: on
line diff
--- a/hgext/eol.py Wed Mar 19 23:04:03 2014 -0700 +++ b/hgext/eol.py Tue Apr 01 15:11:19 2014 -0500 @@ -344,7 +344,7 @@ continue if inconsistenteol(data): raise util.Abort(_("inconsistent newline style " - "in %s\n" % f)) + "in %s\n") % f) return super(eolrepo, self).commitctx(ctx, error) repo.__class__ = eolrepo repo._hgcleardirstate()