# 
# patch "ChangeLog"
#  from [3e86aea4870157b3eef3ae4952d15da9f0b93c38]
#    to [0966f4abb29bc155f9b0040d0533d5db076969c9]
# 
# patch "std_hooks.lua"
#  from [a155f905ed9e742f02ad6648546080b4e33719a4]
#    to [fd05c10e0f76992b9d421714d4430c9ae5c341f8]
# 
===============================================
--- ChangeLog	3e86aea4870157b3eef3ae4952d15da9f0b93c38
+++ ChangeLog	0966f4abb29bc155f9b0040d0533d5db076969c9
@@ -1,3 +1,9 @@
+2005-08-03  Matthew A. Nicholson  <address@hidden>
+
+	* std_hooks.lua (get_preferred_merge2_command)
+	(get_preferred_merge3_command): Provide more information on how to
+	use vim as merge tool.
+
 2005-08-03  graydon hoare  <address@hidden>
 
 	* unix/process.cc (make_executable): Fix race, set user/group/other.
===============================================
--- std_hooks.lua	a155f905ed9e742f02ad6648546080b4e33719a4
+++ std_hooks.lua	fd05c10e0f76992b9d421714d4430c9ae5c341f8
@@ -363,6 +363,9 @@
          cmd = merge2_emacs_cmd ("emacs", lfile, 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"..
+          "You should merge all changes to *LEFT* file due to limitation of program\n"..
+          "arguments.\n\n")) 
       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 
@@ -450,10 +453,13 @@
          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"..
+          "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 
-         cmd = merge3_vim_cmd ("gvim", lfile, afile, rfile, outfile) 
+         cmd = merge3_vim_cmd ("gvim", afile, lfile, rfile, outfile) 
       elseif program_exists_in_path ("vim") then 
-         cmd = merge3_vim_cmd ("vim", lfile, afile, rfile, outfile) 
+         cmd = merge3_vim_cmd ("vim", afile, lfile, rfile, outfile) 
       end
    elseif program_exists_in_path ("meld") then 
       tbl.meld_exists = true