Mercurial > hg
comparison mercurial/simplemerge.py @ 11285:f118029e534c
rebase: use usual util.abort rather than error.ParseError
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 04 Jun 2010 17:22:33 -0500 |
parents | 08a0f04b56bd |
children | 81c4e18c7cee |
comparison
equal
deleted
inserted
replaced
11284:0b5c2e82aeb5 | 11285:f118029e534c |
---|