Show More
@@ -2003,10 +2003,13 b' def manifest(ui, repo, node=None, rev=No' | |||||
2003 | def merge(ui, repo, node=None, force=None, rev=None): |
|
2003 | def merge(ui, repo, node=None, force=None, rev=None): | |
2004 | """merge working directory with another revision |
|
2004 | """merge working directory with another revision | |
2005 |
|
2005 | |||
2006 |
|
|
2006 | The contents of the current working directory is updated with all | |
2007 | requested revision. Files that changed between either parent are |
|
2007 | changes made in the requested revision since the last common | |
2008 | marked as changed for the next commit and a commit must be |
|
2008 | predecessor revision. | |
2009 | performed before any further updates are allowed. |
|
2009 | ||
|
2010 | Files that changed between either parent are marked as changed for | |||
|
2011 | the next commit and a commit must be performed before any further | |||
|
2012 | updates are allowed. The next commit has two parents. | |||
2010 |
|
2013 | |||
2011 | If no revision is specified, the working directory's parent is a |
|
2014 | If no revision is specified, the working directory's parent is a | |
2012 | head revision, and the current branch contains exactly one other head, |
|
2015 | head revision, and the current branch contains exactly one other head, |
General Comments 0
You need to be logged in to leave comments.
Login now