#
#
# patch "std_hooks.lua"
#  from [f6f5c8d503faca26fdc2e06a1a9285f8d4b3700f]
#    to [149fd794ce4f182372cde6b3f12c8877256a58b3]
#
============================================================
--- std_hooks.lua	f6f5c8d503faca26fdc2e06a1a9285f8d4b3700f
+++ std_hooks.lua	149fd794ce4f182372cde6b3f12c8877256a58b3
@@ -765,7 +765,7 @@ function get_preferred_merge3_command (t
    -- If there wasn't any user-given merger, take the first that's available
    -- and wanted.
    for _,mkey in ipairs(default_order) do
-      c = trymerger(mkey) ; if c then return c,nil end
+      c = trymerger(mkey) ; if c then return c,mkey end
    end
 end