Recent git changes and unmerged files

[Kai Willadsen <kai willadsen gmail com>]

Hi all,

Since I'm not a real git expert, I thought I'd solicit some help on
bug 617098 (https://bugzilla.gnome.org/show_bug.cgi?id=617098). The
short version is that now that we use git-diff-index, unmerged files
are not correctly detected. There's a patch at the bug, but I'd love
feedback and testing, particularly from anyone with an understanding
of git plumbing.

cheers,
Kai