Show More
@@ -942,7 +942,8 b' def backout(ui, repo, rev, **opts):' | |||||
942 | else: |
|
942 | else: | |
943 | ui.status(_('the backout changeset is a new head - ' |
|
943 | ui.status(_('the backout changeset is a new head - ' | |
944 | 'do not forget to merge\n')) |
|
944 | 'do not forget to merge\n')) | |
945 |
ui.status(_('(use "backout -m" |
|
945 | ui.status(_('(use "backout --merge" ' | |
|
946 | 'if you want to auto-merge)\n')) | |||
946 |
|
947 | |||
947 | def bundle(ui, repo, fname, dest=None, **opts): |
|
948 | def bundle(ui, repo, fname, dest=None, **opts): | |
948 | """create a changegroup file |
|
949 | """create a changegroup file |
General Comments 0
You need to be logged in to leave comments.
Login now