Uncommitted changes and merge

[Giorgos Keramidas]

On 2007-09-06 15:09, Peter Arrenbrecht <peter.arrenbrecht at gmail.com> wrote:
> On 9/6/07, Steve Borho <steve at borho.org> wrote:
> > If you use --git style patches, mq can handle binary files.  The easiest
> > way to enable them is to add to your hgrc:
> >
> > [defaults]
> > qrefresh = --git
> > qnew = --git
> >
> > (I thought I read somewhere you could just add 'diff = --git', but I've
> > never tried it)
>
> When setting qnew = --git, I got an error about --git being
> unsupported by qnew. However, using
>
>   [diff]
>   git=true
>
> all works fine for me.

Steve is using a more recent Mercurial build.  In the current "Crew"
repository, the qnew command supports the --git option since the
following commit by Patrick Mezard:

% changeset:   5025:7041869a1bf6
% user:        Patrick Mezard <pmezard at gmail.com>
% date:        Sat Jul 28 20:15:54 2007 +0200
% files:       hgext/mq.py
% description:
% mq: add qnew --git option

This change is not part of the latest official release of Mercurial, but
you can easily pick it up from mercurial-crew if you need it :)