diff mercurial/merge.py @ 18505:9de9727cea53 stable

merge: fix UnboundLocalError (issue3791)

A wrong variable name was introduced in 384df4db6520 for a case without test
coverage.

The variable name is fixed and a test case is introduced.

--- a/mercurial/merge.py	Mon Jan 28 19:05:35 2013 +0900
+++ b/mercurial/merge.py	Wed Jan 30 19:29:36 2013 +0100
@@ -251,7 +251,7 @@
             elif nol and n2 == a: # remote only changed 'x'
                 act("update permissions", "e", f, fl2)
             elif nol and n == a: # local only changed 'x'
-                act("remote is newer", "g", f, fl)
+                act("remote is newer", "g", f, fl1)
             else: # both changed something
                 act("versions differ", "m", f, f, f, False)
         elif f in copied: # files we'll deal with on m2 side