git-gui: 'Unhandled 2 way diff marker:' for typechanged path

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