##// END OF EJS Templates
merge: remove excess creation of changectx
Kevin Bullock -
r15618:0aca2695 default
parent child Browse files
Show More
@@ -4043,7 +4043,7 b' def merge(ui, repo, node=None, **opts):'
4043 % branch,
4043 % branch,
4044 hint=_("run 'hg heads' to see all heads"))
4044 hint=_("run 'hg heads' to see all heads"))
4045 msg = _('there is nothing to merge')
4045 msg = _('there is nothing to merge')
4046 if parent != repo.lookup(repo[None].branch()):
4046 if parent != repo.lookup(branch):
4047 msg = _('%s - use "hg update" instead') % msg
4047 msg = _('%s - use "hg update" instead') % msg
4048 raise util.Abort(msg)
4048 raise util.Abort(msg)
4049
4049
General Comments 0
You need to be logged in to leave comments. Login now