Mercurial > hg
diff mercurial/ui.py @ 13874:9d67277c9204
merge: add ancestor to the update function
This makes it easier to do rebase-like operations.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Apr 2011 15:25:20 -0500 |
parents | 9f97de157aad |
children | af60153b5e3b |