Uncommitted changes and merge

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Thu Sep 6 08:09:11 CDT 2007


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.
-peo


More information about the Mercurial mailing list