# # # patch "std_hooks.lua" # from [2ba3a350693b2f2cd36ae858f7aad77cb5151fb6] # to [0ec5e28b9efb70f63a89ced50b6e311d5b46a752] # ============================================================ --- std_hooks.lua 2ba3a350693b2f2cd36ae858f7aad77cb5151fb6 +++ std_hooks.lua 0ec5e28b9efb70f63a89ced50b6e311d5b46a752 @@ -477,7 +477,7 @@ mergers.rcsmerge = { } -- GNU diffutils based merging -mergers.diffutils_new = { +mergers.diffutils = { -- merge procedure execution cmd = function (tbl) if os.getenv("MTN_MERGE_DIFFUTILS") == "partial" then