#
#
# patch "std_hooks.lua"
#  from [476117cb5843a576bc2cfb7f989eba32fd0524c4]
#    to [52d2442022067e600abd12f540656c3b8848528c]
#
============================================================
--- std_hooks.lua	476117cb5843a576bc2cfb7f989eba32fd0524c4
+++ std_hooks.lua	52d2442022067e600abd12f540656c3b8848528c
@@ -27,6 +27,15 @@ end
    return ret
 end
 
+function execute_redirected(stdin, stdout, stderr, path, ...)
+   local pid
+   local ret = -1
+   io.flush();
+   pid = spawn_redirected(stdin, stdout, stderr, path, unpack(arg))
+   if (pid ~= -1) then ret, pid = wait(pid) end
+   return ret
+end
+
 -- Wrapper around execute to let user confirm in the case where a subprocess
 -- returns immediately
 -- This is needed to work around some brokenness with some merge tools
@@ -357,6 +366,13 @@ mergers = {}
 --             `merger' variable or the MTN_MERGE environment variable.
 mergers = {}
 
+-- This merger is designed to fail if there are any conflicts without trying to resolve them
+mergers.fail = {
+   cmd = function (tbl) return false end,
+   available = function () return true end,
+   wanted = function () return true end
+}
+
 mergers.meld = {
    cmd = function (tbl)
       io.write (string.format("\nWARNING: 'meld' was choosen to perform external 3-way merge.\n"..