abudden avatar abudden committed b4b8872

Added information on using threesome with Bazaar to website.

Comments (0)

Files changed (1)

site/index.markdown

 
 **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
 ----------------
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.