Fix for consistency with other instructions on web page.
| author |
A. S. Budden <abudden@gmail.com> |
| date |
Mon, 19 Sep 2011 13:12:48 +0100 |
| parents |
b4b887219024
|
| children |
33fc975d65e2
|
| branches/tags |
(none) |
| files |
site/index.markdown |
Changes
--- 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.