Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 3901:733d56b8830f
fix strip on windows
c: was interpreted as a protocol, prepend file: to the bundle file name
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 15 Dec 2006 23:19:12 +0100 |
| parents | c0a12e6441a5 |
| children | 1e0b94cfba0e c95060a5391a |
comparison
equal
deleted
inserted
replaced
| 3900:2b3175acb653 | 3901:733d56b8830f |
|---|