Re: [Monotone-devel] xxdiff "save as merged"

[Martin Blais]

On 5/16/06, Derek Scherger <address@hidden> wrote:
> Martin Blais wrote:
> > Hi
> >
> > I recently saw this note in the Monotone FAQ:
> >
> >  Isn't it annoying that xxdiff doesn't have any keybinding for "save
> > as merged"?
> >  echo 'Accel.SaveAsMerged: "Ctrl+M"' >>~/.xxdiffrc
> >
> > I'm the author of xxdiff.
> > I added it as a default binding in the xxdiff-3.2b4 build.
> > This will be included in the upcoming 3.2 release.
>
> Cool! And thanks for the great merge tool, it's the preferred choice by
> many of us here.

Excellent! :-)

Then you will be happy to learn that the upcoming 3.2 version will
include a lot of fresh Python code to write wrapper scripts around
xxdiff.  This will make it *really easy* to write scripts that invoke
it for specific developing processes.  All the old scripts have been
refactored to use this new infrastructure, and since I now use
Subversion a lot, new svn scripts have been written, tested and are
included as well.   These should form good examples to write analogue
scripts for Monotone.  Feel free to have a look, for example, at
xx-svn-diff:

http://furius.ca/downloads/xxdiff/snapshots/

cheers,



--
Martin Blais
Furius Python Training -- http://furius.ca/training/