branch | stable |
changeset 30859 | 086c37652735 |
parent 30856 | 41f6af50c0d8 |
child 30930 | 47278970fc8c |
--- a/mercurial/merge.py Mon Jan 30 18:03:17 2017 -0500 +++ b/mercurial/merge.py Wed Feb 01 02:10:30 2017 +0100 @@ -1039,8 +1039,7 @@ for f in dms: dm, (f0, flags), msg = actions[f] assert dm == 'dm', dm - m, args, msg = actions[f0] - if m == 'r': + if f0 in actions and actions[f0][0] == 'r': # We have one bid for removing a file and another for moving it. # These two could be merged as first move and then delete ... # but instead drop moving and just delete.