summaryrefslogtreecommitdiff
path: root/show-diff.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-27 01:03:07 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-27 01:03:07 (GMT)
commitb0fe89caeb0c37405874bad66702f49ff4977972 (patch)
tree2f845bb1876feda8b28cbe0885f1e8f05c92e597 /show-diff.c
parenta5cd7e16205f29c757ccd925d3f6ac8b5e6cc553 (diff)
downloadgit-b0fe89caeb0c37405874bad66702f49ff4977972.zip
git-b0fe89caeb0c37405874bad66702f49ff4977972.tar.gz
git-b0fe89caeb0c37405874bad66702f49ff4977972.tar.bz2
diff-cache: fix handling of unmerged files.
We've always warned about them properly, but we would then do the wrong thing if that filename existed in the tree we were comparing against (we'd think the file has been deleted, because we forgot about the unmerged cases).
Diffstat (limited to 'show-diff.c')
0 files changed, 0 insertions, 0 deletions