Mercurial > hg > pyhgsh
diff hgmerge @ 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 | 9c918287d10b |
children | 696851b1bba9 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 05 Oct 2005 19:27:35 -0700 |
parents | 9c918287d10b |
children | 696851b1bba9 |