#
#
# patch "tests/resolve_conflicts_all_resolutions/__driver__.lua"
#  from [ecaaa54dedc2398e3c635ddbed2c778309d5e53a]
#    to [ccc947753602555e322d56497d64751796ba3236]
#
============================================================
--- tests/resolve_conflicts_all_resolutions/__driver__.lua	ecaaa54dedc2398e3c635ddbed2c778309d5e53a
+++ tests/resolve_conflicts_all_resolutions/__driver__.lua	ccc947753602555e322d56497d64751796ba3236
@@ -120,7 +120,8 @@ mkdir("_MTN/resolutions")
 check(samefilestd("show_first-interactive", "stderr"))
 
 mkdir("_MTN/resolutions")
-check(mtn("--rcfile=merge3_hook.lua", "conflicts", "--conflicts-file=_MTN/conflicts-1", "resolve_first", "interactive", "_MTN/resolutions/interactive_file"), 0, true, nil)
+check(mtn("--rcfile=merge3_hook.lua", "conflicts", "--conflicts-file=_MTN/conflicts-1", "resolve_first", "interactive", "_MTN/resolutions/interactive_file"), 0, true, true)
+check(samelines("stderr", { "mtn: lua: running merge3 hook" }))
 
 check(mtn("conflicts", "--conflicts-file=_MTN/conflicts-1", "show_first"), 0, nil, true)
 canonicalize("stderr")