Show More
@@ -1600,7 +1600,7 b' def update(repo, node, branchmerge, forc' | |||
|
1600 | 1600 | |
|
1601 | 1601 | if updatecheck == 'noconflict': |
|
1602 | 1602 | for f, (m, args, msg) in actionbyfile.iteritems(): |
|
1603 | if m not in ('g', 'k', 'r'): | |
|
1603 | if m not in ('g', 'k', 'e', 'r'): | |
|
1604 | 1604 | msg = _("conflicting changes") |
|
1605 | 1605 | hint = _("commit or update --clean to discard changes") |
|
1606 | 1606 | raise error.Abort(msg, hint=hint) |
General Comments 0
You need to be logged in to leave comments.
Login now