merge with i18n stable 4.1

merge with i18n

--- 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.