# 
# patch "std_hooks.lua"
#  from [3641b887fd48cb670b792d9ed0ee2f8dda14f836]
#    to [572befdb727cd626e7a8efd27d5a8109bdfebd27]
# 
--- std_hooks.lua
+++ std_hooks.lua
@@ -324,7 +324,7 @@
        elseif program_exists_in_path ("xemacs") then 
           cmd = merge2_emacs_cmd ("xemacs", lfile, rfile, outfile) 
        end
-     else if string.find(editor, "vim") ~= nil then
+     elseif string.find(editor, "vim") ~= nil then
        if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then
           cmd = merge2_vim_cmd ("gvim", lfile, rfile, outfile) 
        elseif program_exists_in_path ("vim") then