From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Mon, 25 Oct 2010 12:59:00 GMT
Subject: git-gui: 'Unhandled 2 way diff marker:' for typechanged path
Message-ID: <AANLkTi=dA+mj1KDpAgGAtg1S5Gt5wXAJ4zLd-tLob=DH@mail.gmail.com>

Hi,

I get this error from git gui after I changed a symlink to a file:

error: Unhandled 2 way diff marker: {d}

To reproduce:

$ git init
$ ln -s bar foo
$ git add foo
$ git commit -m "add foo link"
$ rm foo
$ echo bar >foo
$ git gui
error: Unhandled 2 way diff marker: {d}

I may have a look into this by my self in the long term, but maybe
someone is faster than me.

Regards,
Bert