# 
# patch "ChangeLog"
#  from [52d9f3bbb974e21438d9f45f5b848ef3a9a77835]
#    to [d512a4bbd574b20be372041d26c6a463168efc6e]
# 
# patch "std_hooks.lua"
#  from [fd05c10e0f76992b9d421714d4430c9ae5c341f8]
#    to [4948b0bd7f95c210458b10105fe671dae7a5e81b]
# 
========================================================================
--- ChangeLog	52d9f3bbb974e21438d9f45f5b848ef3a9a77835
+++ ChangeLog	d512a4bbd574b20be372041d26c6a463168efc6e
@@ -1,3 +1,8 @@
+2005-08-09  Richard Li  <address@hidden>
+
+	* std_hooks.lua (merge2, merge3): explain a little better why
+	monotone can't find a merge command.
+
 2005-08-09  Nathaniel Smith  <address@hidden>
 
 	* commands.cc (update): Fix helpful error message to suggest
========================================================================
--- std_hooks.lua	fd05c10e0f76992b9d421714d4430c9ae5c341f8
+++ std_hooks.lua	4948b0bd7f95c210458b10105fe671dae7a5e81b
@@ -417,7 +417,10 @@
             ret = nil 
          end
       else
-         io.write ("no external 2-way merge command found\n")
+         io.write (string.format("No external 2-way merge command found.\n"..
+            "You may want to check that $EDITOR is set to an editor that supports 2-way merge,\n"..
+            "set this explicitly in your get_preferred_merge2_command hook,\n"..
+            "or add a 2-way merge program to your path.\n\n"))
       end
    end
 
@@ -509,7 +512,10 @@
             ret = nil 
          end
       else
-         io.write ("no external 3-way merge command found\n")
+         io.write (string.format("No external 3-way merge command found.\n"..
+            "You may want to check that $EDITOR is set to an editor that supports 3-way merge,\n"..
+            "set this explicitly in your get_preferred_merge3_command hook,\n"..
+            "or add a 3-way merge program to your path.\n\n"))
       end
    end