]> git.ipfire.org Git - thirdparty/git.git/commit - diff-cache.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a5cd7e1) | patch
diff-cache: fix handling of unmerged files.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 01:03:07 +0000 (18:03 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 01:03:07 +0000 (18:03 -0700)
commitb0fe89caeb0c37405874bad66702f49ff4977972
tree2f845bb1876feda8b28cbe0885f1e8f05c92e597tree | snapshot
parenta5cd7e16205f29c757ccd925d3f6ac8b5e6cc553commit | diff
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).
diff-cache.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.