Show More
@@ -2746,11 +2746,7 b' def update(ui, repo, node=None, merge=Fa' | |||||
2746 | merging or discarding local changes. |
|
2746 | merging or discarding local changes. | |
2747 | """ |
|
2747 | """ | |
2748 | node = _lookup(repo, node, branch) |
|
2748 | node = _lookup(repo, node, branch) | |
2749 |
if |
|
2749 | if clean: | |
2750 | ui.warn(_('(the -m/--merge option is deprecated; ' |
|
|||
2751 | 'use the merge command instead)\n')) |
|
|||
2752 | return hg.merge(repo, node, force=force) |
|
|||
2753 | elif clean: |
|
|||
2754 | return hg.clean(repo, node) |
|
2750 | return hg.clean(repo, node) | |
2755 | else: |
|
2751 | else: | |
2756 | return hg.update(repo, node) |
|
2752 | return hg.update(repo, node) |
General Comments 0
You need to be logged in to leave comments.
Login now