From: Paul Mackerras <paulus@samba.org>
Date: Tue, 4 Nov 2008 10:09:00 +0000 (+1100)
Subject: gitk: Cope with unmerged files in local changes
X-Git-Tag: v1.6.1-rc1~49^2~4^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/48a81b7cda1e58d8cc4d9bcadce76bbf1680ab7d?ds=inline;hp=48a81b7cda1e58d8cc4d9bcadce76bbf1680ab7d

gitk: Cope with unmerged files in local changes

This modifies gettreediffline so that it when we get both a "U" line
and an "M" line for the same file in the output from git diff-files
or git diff-index --cached (used when the user clicks on a fake commit)
we don't add the same filename to the treediff list twice.

This also makes getblobdiffline recognize the "* Unmerged path ..."
lines we get when we ask for the actual diffs, and makes a tiny
optimization in makediffhdr.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---