projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 884fd05) | patch
git-gui: Correctly ignore '* Unmerged path' during diff.
authorShawn O. Pearce <spearce@spearce.org>
Sun, 21 Jan 2007 19:23:51 +0000 (14:23 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 22 Jan 2007 03:47:56 +0000 (22:47 -0500)
commit37d2a1c9fa2f94093cb6bd5e6b2aa6a38c95593e
treed9d046d074141283159d969be35a2851262a434atree | snapshot
parent884fd059f8c86dc815ea7fd769f7190e3f248536commit | diff
git-gui: Correctly ignore '* Unmerged path' during diff.

If a path is really unmerged, such as because it has been deleted and
also modifed, we cannot obtain a diff for it.  Instead Git is sending
back '* Unmerged path <blah>' for file <blah>.  We should display this
line as-is as our tag selecting switches don't recognize it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh diff | blob | history
Git—the stupid content tracker