Uncommitted changes and merge

[Peter Arrenbrecht]

I'm running 0.9.4. Built and installed it myself on Ubuntu 7.04 to
~/local. Also have 0.9.3 installed from Ubuntu repos, but local
install takes precedence. Same thing happened on 0.9.3 which is why I
tried 0.9.4.

<cite>
peo at pearwood:~$ hg version
Mercurial Distributed SCM (version 0.9.4)

Copyright (C) 2005-2007 Matt Mackall <mpm at selenic.com> and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
</cite>

-peo


On 9/6/07, Steve Borho <steve at borho.org> wrote:
> On Thu, 2007-09-06 at 15:09 +0200, Peter Arrenbrecht 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
>
> Really?  What version of mercurial are you running?
>
> >   [diff]
> >   git=true
>
> Cool.  Thanks.
>
> --
> Steve Borho (steve at borho.org)
> http://www.borho.org/~steve/steve.asc
> Key fingerprint = 2D08 E7CF B624 624C DE1F  E2E4 B0C2 5292 F2C6 2C8C
>
>
>