Mercurial > hg
diff mercurial/dispatch.py @ 8734:60fa3371aa75
merge: pretend ancestor is local to simplify backwards and overwrite
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | 21688b8a594b |
children | eb7b247a98ea 62e3b9466700 |