# HG changeset patch
# User Kevin Bullock <kbullock+mercurial@ringworld.org>
# Date 1485965710 21600
# Node ID e1526da1e6d84e03146151c9b6e6950fe9a83d7d
# Parent  086c37652735ca87117333fc71941bcb67b799c3# Parent  54d3976dc623a0ec3e1993e9e1cce8cc2105c871
merge with i18n

diff -r 54d3976dc623 -r e1526da1e6d8 mercurial/merge.py
--- a/mercurial/merge.py	Wed Feb 01 08:47:11 2017 -0200
+++ b/mercurial/merge.py	Wed Feb 01 10:15:10 2017 -0600
@@ -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.