How to set vimdiff as external merge tool

Asked by Wayne Werner on 2010-07-20

Hi, I'm trying to set vimdiff as the external merge tool in the bazaar GUI on winXP.

If I edit a file, commit it, then create a branch and edit a line in the file then try to merge the file, I get conflicts in the file as I expect. Then I click the little red /!\ icon that pops up the conflicts dialog. When I select the file and click launch I get Error while running merge tool (code 0).

In my bazaar.conf file I have this line under [DEFAULT]:

external_merge = C:/Program Files/Vim/vim72/gvim.exe -o %o %t %r %b

I have no idea what the placeholder %o, %t, %r, or %b actually mean, I presume they have something to do with the files, but unless they're listed, the conflict window says they're missing.

I can edit multiple files with C:/Program Files/Vim/vim72/gvim.exe -o (or -d for diff), but I'm not sure how to make bazaar use vim as my merge tool.

TIA,
Wayne

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Explorer Edit question
Assignee:
No assignee Edit question
Last query:
2010-07-20
Last reply:
2010-07-29
Alexander Belchenko (bialix) said : #1

Wayne Werner пишет:
> In my bazaar.conf file I have this line under [DEFAULT]:
>
> external_merge = C:/Program Files/Vim/vim72/gvim.exe -o %o %t %r %b
>
> I have no idea what the placeholder %o, %t, %r, or %b actually mean, I presume they have something to do with the files, but unless they're listed, the conflict window says they're missing.

About placeholders:

%o means OTHER file, e.g. foo.txt.OTHER
%t means THIS file, e.g. foo.txt.THIS
%b means BASE files, e.g. foo.txt.BASE
%r means result file, e.g. foo.txt

Can you help with this problem?

Provide an answer of your own, or ask Wayne Werner for more information if necessary.

To post a message you must log in.