# # # patch "std_hooks.lua" # from [2f0bc8e049e4121c355a89f5945eea1d66ca7f88] # to [c4f02c95a5717f64d0a60251081ff5bd1a8038de] # ============================================================ --- std_hooks.lua 2f0bc8e049e4121c355a89f5945eea1d66ca7f88 +++ std_hooks.lua c4f02c95a5717f64d0a60251081ff5bd1a8038de @@ -478,7 +478,7 @@ mergers.vim = { os.rename(lfile_merged, tbl.lfile) os.rename(rfile_merged, tbl.rfile) - local ret = execute(vim, "-f", "-d", "-c", string.format("file %s", tbl.outfile), + local ret = execute(vim, "-f", "-d", "-c", string.format("silent file %s", tbl.outfile), tbl.lfile, tbl.rfile) if (ret ~= 0) then io.write(string.format(gettext("Error running merger '%s'\n"), vim))