# HG changeset patch
# User mpm@selenic.com
# Date 1117006446 28800
# Node ID 8cd45e152c830b674a9cc9094f58f59139089ec5
# Parent  c32286d0a6653f764c719a507c47c855bee6f5bf
Pass filename to $HGMERGE

This lets the merge program be slightly more user-friendly



diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -776,7 +776,7 @@ class localrepository:
 
             cmd = os.environ["HGMERGE"]
             self.ui.debug("invoking merge with %s\n" % cmd)
-            r = os.system("%s %s %s %s" % (cmd, a, b, c))
+            r = os.system("%s %s %s %s %s" % (cmd, a, b, c, fn))
             if r:
                 raise "Merge failed!"