Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/util.py @ 1389:9b3ef6f3cef5
convert-repo: fix up octopus merge conversion
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 05 Oct 2005 19:27:35 -0700 |
parents | 854775b27d1a |
children | 9395c2f94130 |