Mercurial > hg

changeset 149:8cd45e152c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass filename to $HGMERGE This lets the merge program be slightly more user-friendly
author mpm@selenic.com
date Tue, 24 May 2005 23:34:06 -0800
parents c32286d0a665
children 8029ee2949b8
files mercurial/hg.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Tue May 24 23:13:25 2005 -0800
+++ b/mercurial/hg.py	Tue May 24 23:34:06 2005 -0800
@@ -776,7 +776,7 @@
 
             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!"