Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 326:235443668bea
mdiff: fix the fix
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
mdiff: fix the fix
I saw you check in the thing back in but with another typo.
You check in "la < lenb", should be "la < lena".
So we are even :-)
Chris
manifest hash: 57157502250b0120bcc12a75a530d4c133673b39
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCrg5tywK+sNU5EO8RAvLPAKCOs76LKPniKHFa15YwzWWsNZ5/xACfesl3
WCiUjdeYUtU3jVKCEwmjAT0=
=+GFy
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Mon, 13 Jun 2005 14:53:33 -0800 |
parents | f06a4a3b86a7 |
children | 3d4d5f2aba9a 4fc63e22b1fe |
comparison
equal
deleted
inserted
replaced
325:ad87e19854a6 | 326:235443668bea |
---|