Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 3268:6901d3545021
Some versions of sed don't support .\+, so use ..* instead.
Reported by Christian Ebert for MacOS X.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 05 Oct 2006 20:03:38 +0200 |
parents | c93ce7f10f85 |
children | ae85272b59a4 |
comparison
equal
deleted
inserted
replaced
3267:bb057b6ce3cf | 3268:6901d3545021 |
---|