# 
# 
# patch "std_hooks.lua"
#  from [9ea5ff4f7eacc7f5b5f1e8ec181154434a48637b]
#    to [bd7e1c41b16b89860407930bc4a53f109fd6f8f4]
# 
============================================================
--- std_hooks.lua	9ea5ff4f7eacc7f5b5f1e8ec181154434a48637b
+++ std_hooks.lua	bd7e1c41b16b89860407930bc4a53f109fd6f8f4
@@ -24,8 +24,15 @@
 -- This is needed to work around some brokenness with some merge tools
 -- (e.g. on OS X)
 function execute_confirm(path, ...)   
-   execute(path, unpack(arg))
-   print(gettext("Press enter when the subprocess has completed"))
+   ret = execute(path, unpack(arg))
+
+   if (ret ~= 0)
+   then
+      io.write(string.format(gettext("Error running '%s'\n"), path))
+      print(gettext("Press enter"))
+   else
+      print(gettext("Press enter when the subprocess has completed"))
+   end
    io.read()
    return ret
 end