b4b887219024

Added information on using threesome with Bazaar to website.
[view raw] [browse files]
author A. S. Budden <abudden@gmail.com>
date Mon, 19 Sep 2011 13:11:05 +0100
parents 495ff793a490
children 369ed2855a55
branches/tags (none)
files site/index.markdown

Changes

diff -r 495ff793a490 -r b4b887219024 site/index.markdown
--- a/site/index.markdown	Mon Sep 19 13:09:37 2011 +0100
+++ b/site/index.markdown	Mon Sep 19 13:11:05 2011 +0100
@@ -63,6 +63,22 @@
 
 **Note:** replace `mvim` with `gvim` if you're on Linux, or just plain `vim` if you prefer to keep the editor in the console.
 
+### Bazaar
+
+For Bazaar 2.4 or greater, add the following line to bazaar.conf:
+
+    bzr.mergetool.threesome = vim {base} {this} {other} {result} -c 'ThreesomeInit'
+
+Optionally, change the default merge tool by setting:
+
+    bzr.default_mergetool = threesome
+
+For earlier versions of Bazaar, set the following entry in bazaar.conf:
+
+    external_merge = vim %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.
+
 More Information
 ----------------