[Monotone-devel] Textual change for vim merging warning

[Matthew A. Nicholson]

Here is a fix for an oversight (on my part) for the 3-way merge vim 
warning message.  It says 2-way merge when it should say 3-way merge.
--
Matthew A. Nicholson
Digium

# 
# patch "std_hooks.lua"
#  from [faebc0e3d0c114b6ad2f6787f8413570a8bb4c9c]
#    to [7035181f8e65b9fd1a41718fb9b225cf62ab8276]
# 
================================================================================
--- std_hooks.lua       faebc0e3d0c114b6ad2f6787f8413570a8bb4c9c
+++ std_hooks.lua       7035181f8e65b9fd1a41718fb9b225cf62ab8276
@@ -600,7 +600,7 @@
          cmd = merge3_emacs_cmd ("emacs", lfile, afile, rfile, outfile) 
       end
    elseif string.find(editor, "vim") ~= nil then
-      io.write (string.format("\nWARNING: 'vim' was choosen to perform 
external 2-way merge.\n"..
+      io.write (string.format("\nWARNING: 'vim' was choosen to perform 
external 3-way merge.\n"..
           "You should merge all changes to *LEFT* file due to limitation of 
program\n"..
           "arguments.  The order of the files is ancestor, left, right.\n\n")) 
       if os.getenv ("DISPLAY") ~= nil and program_exists_in_path ("gvim") then