Category: 
The excellent extmerge plugin wants to tell the external merge tool about 4 files. Meld only likes to work with three files. Rather than patch meld, I found John’s old suggestion on the mailing list and hacked it into a little meld wrapper that gives both bazaar and meld the interfaces they expect. If you are a kdiff3 user, well, extmerge works out of the box for you. I’m partial to meld though, so here is the glue you need (I put this in a script called meld-helper in ~/bin):
# Add this line to your ~/.bazaar/bazaar.conf # external_merge = 'meld-helper %r %b %t %o' rm $1 mv $3 $1 meld $2 $4 $1
Recently:
Comments
This entry was posted on Monday, October 1st, 2007 at 10:59 pm and is filed under Uncategorized. You can follow any responses to this entry through the RSS 2.0 feed. You can leave a response, or trackback from your own site.
I have a problem with using this script. I get this error from bzr extmerge:
bzr: ERROR: [Errno 8] Exec format error
I checked that the script is executable (ran it from the command line and that works. Any ideas?
thanks a lot,
Pieter