495ff793a490

Added information on using threesome with Bazaar to Vim documentation.
[view raw] [browse files]
author A. S. Budden <abudden@gmail.com>
date Mon, 19 Sep 2011 13:09:37 +0100
parents eab60b05e2b5
children b4b887219024
branches/tags (none)
files doc/threesome.txt

Changes

diff -r eab60b05e2b5 -r 495ff793a490 doc/threesome.txt
--- a/doc/threesome.txt	Mon Sep 19 13:09:10 2011 +0100
+++ b/doc/threesome.txt	Mon Sep 19 13:09:37 2011 +0100
@@ -15,7 +15,7 @@
 
 Threesome is a Vim plugin for resolving conflicts during three-way merges.
 It's designed to be used as a merge tool for version control systems like
-Mercurial and Git.
+Mercurial, Git and Bazaar.
 
 ==============================================================================
 CONTENTS                                                  *Threesome-contents*
@@ -23,6 +23,7 @@
     1. Version Control Integration ................. |ThreesomeVCS|
         1.1 Mercurial .............................. |ThreesomeVCS_hg|
         1.2 Git .................................... |ThreesomeVCS_git|
+        1.3 Bazaar ................................. |ThreesomeVCS_bzr|
     2. Basic Usage ................................. |ThreesomeUsage|
         2.1 Files .................................. |ThreesomeUsage_files|
         2.2 Modes .................................. |ThreesomeUsage_modes|
@@ -100,6 +101,23 @@
 "git mergetool".  Git will loop over all the files with conflicts and allow
 you to resolve them with Vim and Threesome.
 
+------------------------------------------------------------------------------
+1.3 Bazaar                                                  *ThreesomeVCS_bzr*
+
+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'
+<
+You can now use Vim with Threesome from "bzr qconflicts".
+
 ==============================================================================
 2. Basic Usage                                                *ThreesomeUsage*