# 
# patch "ChangeLog"
#  from [935b6b18ae73c892ace4c8fd4471d1db0d3d8e12]
#    to [016732448d020c58a1245727ae00ec66f9533fdb]
# 
# patch "std_hooks.lua"
#  from [faebc0e3d0c114b6ad2f6787f8413570a8bb4c9c]
#    to [7035181f8e65b9fd1a41718fb9b225cf62ab8276]
# 
========================================================================
--- ChangeLog	935b6b18ae73c892ace4c8fd4471d1db0d3d8e12
+++ ChangeLog	016732448d020c58a1245727ae00ec66f9533fdb
@@ -1,3 +1,7 @@
+2005-10-19  Matthew A. Nicholson  <address@hidden>
+
+	* std_hooks.lua: Minor correction to vim warning during 3-way merge.
+
 2005-10-18  Timothy Brownawell  <address@hidden>
 
 	* contrib/usher.cc: Update comment about client versions
========================================================================
--- 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