Mercurial > hg
diff mercurial/crecord.py @ 29937:2c302c654451
merge with stable
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Wed, 14 Sep 2016 17:12:39 +0200 |
parents | bff109e6398a e7766022a61a |
children | 3664537386ab |
line wrap: on
line diff
--- a/mercurial/crecord.py Tue Sep 13 13:49:42 2016 -0700 +++ b/mercurial/crecord.py Wed Sep 14 17:12:39 2016 +0200 @@ -387,7 +387,7 @@ contextlen = (len(self.before) + len(self.after) + removedconvertedtocontext) - if self.after and self.after[-1] == '\\ no newline at end of file\n': + if self.after and self.after[-1] == '\\ No newline at end of file\n': contextlen -= 1 fromlen = contextlen + self.removed tolen = contextlen + self.added