changeset 50844 | fb0f07c64304 |
parent 50843 | 7ef29f8b723d |
child 50845 | e674941ad4eb |
--- a/mercurial/commands.py Sun Aug 20 01:40:50 2023 -0400 +++ b/mercurial/commands.py Sun Aug 20 01:49:48 2023 -0400 @@ -5458,6 +5458,8 @@ hint = _(b'use hg pull followed by hg update DEST') raise error.InputError(msg, hint=hint) + update_conflict = None + for path in urlutil.get_pull_paths(repo, ui, sources): ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(path.loc)) ui.flush()