diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-04 21:09:00 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-04 21:09:00 +1100 |
| commit | 48a81b7cda1e58d8cc4d9bcadce76bbf1680ab7d (patch) | |
| tree | 55f3847f80dda163415178cb5e2797a676f1f966 /git-gui/lib/diff.tcl | |
| parent | gitk: Make "show origin of this line" work on fake commits (diff) | |
| download | git-48a81b7cda1e58d8cc4d9bcadce76bbf1680ab7d.tar.gz git-48a81b7cda1e58d8cc4d9bcadce76bbf1680ab7d.zip | |
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>
Diffstat (limited to 'git-gui/lib/diff.tcl')
0 files changed, 0 insertions, 0 deletions