changeset 41365 | 876494fd967d |
parent 37586 | b94fecf4cd8c |
child 42588 | f6540aba8e3e |
--- a/mercurial/subrepoutil.py Mon Sep 24 14:46:37 2018 -0700 +++ b/mercurial/subrepoutil.py Thu Jan 17 09:17:12 2019 -0800 @@ -145,7 +145,6 @@ promptssrc = filemerge.partextras(labels) for s, l in sorted(s1.iteritems()): - prompts = None a = sa.get(s, nullstate) ld = l # local state with possible dirty flag for compares if wctx.sub(s).dirty(): @@ -218,7 +217,6 @@ wctx.sub(s).remove() for s, r in sorted(s2.items()): - prompts = None if s in s1: continue elif s not in sa: