# HG changeset patch
# User A. S. Budden <abudden@gmail.com>
# Date 1316434368 -3600
# Node ID 369ed2855a55d6a9553b679825e19f1a3e487583
# Parent  b4b887219024ab37d2b55a34e639583e1d37f0cb
Fix for consistency with other instructions on web page.

diff -r b4b887219024 -r 369ed2855a55 site/index.markdown
--- a/site/index.markdown	Mon Sep 19 13:11:05 2011 +0100
+++ b/site/index.markdown	Mon Sep 19 13:12:48 2011 +0100
@@ -67,7 +67,7 @@
 
 For Bazaar 2.4 or greater, add the following line to bazaar.conf:
 
-    bzr.mergetool.threesome = vim {base} {this} {other} {result} -c 'ThreesomeInit'
+    bzr.mergetool.threesome = mvim {base} {this} {other} {result} -c 'ThreesomeInit'
 
 Optionally, change the default merge tool by setting:
 
@@ -75,7 +75,7 @@
 
 For earlier versions of Bazaar, set the following entry in bazaar.conf:
 
-    external_merge = vim %b %t %o %r -c 'ThreesomeInit'
+    external_merge = mvim %b %t %o %r -c 'ThreesomeInit'
 
 **Note:** replace `mvim` with `gvim` if you're on Linux, or just plain `vim` if you prefer to keep the editor in the console.