Mercurial > public > mercurial-scm > hg
diff mercurial/mdiff.py @ 317:b18ce742566a
hg commit: user and date options
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg commit: user and date options
- From Ted Ts'o
manifest hash: f6ce29eed387664c6f0631b666158eb930876cb3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCrHx4ywK+sNU5EO8RAp/uAKCEGhvm1tpBJ9Bub8BlalWaIpMeqgCfUejo
IoevMbk4cjxQ5P3Zo2pSFs8=
=Ibp3
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 12 Jun 2005 10:18:32 -0800 |
parents | 777e388c06d6 |
children | 2819f63b16bf |
line wrap: on
line diff
--- a/mercurial/mdiff.py Sun Jun 12 08:51:11 2005 -0800 +++ b/mercurial/mdiff.py Sun Jun 12 10:18:32 2005 -0800 @@ -67,7 +67,11 @@ for i in a: p.append(p[-1] + len(i)) if sorted: - d = sortdiff(a, b) + try: + d = sortdiff(a, b) + except: + print a, b + raise else: d = difflib.SequenceMatcher(None, a, b).get_matching_blocks() la = 0