#
#
# patch "std_hooks.lua"
#  from [7b72a21724c6b709f94c73271e7ae9ca6202bd6a]
#    to [fc9105dfa61de34c02ce6453f6ac616f581d03f5]
#
============================================================
--- std_hooks.lua	7b72a21724c6b709f94c73271e7ae9ca6202bd6a
+++ std_hooks.lua	fc9105dfa61de34c02ce6453f6ac616f581d03f5
@@ -488,7 +488,7 @@ mergers.diffutils = {
           tbl.afile,
           tbl.rfile
       )
-      if (ret ~= 0) then
+      if (ret == 2) then
          io.write(gettext("Error running GNU diffutils 3-way difference tool 'diff3'\n"))
          return false
       end
@@ -510,7 +510,8 @@ mergers.diffutils = {
    available =
       function ()
           return program_exists_in_path("diff3") and
-                 program_exists_in_path("sdiff");
+                 program_exists_in_path("sdiff") and
+                 program_exists_in_path("diff");
       end,
    wanted =
       function ()