Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4010:e282448d68f1
inst.reason isn't alway in the form (errno, strerror)
urllib2.urlopen("foobar://foo") is an example
where inst.reason is a string
fix issue383
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 28 Dec 2006 01:14:12 +0100 |
| parents | c0a12e6441a5 |
| children | 1e0b94cfba0e c95060a5391a |