diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 18:03:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 18:03:07 -0700 |
| commit | b0fe89caeb0c37405874bad66702f49ff4977972 (patch) | |
| tree | 2f845bb1876feda8b28cbe0885f1e8f05c92e597 /diff-tree.c | |
| parent | diff-cache.c: use the "U <pathname>" format for unmerged entries. (diff) | |
| download | git-b0fe89caeb0c37405874bad66702f49ff4977972.tar.gz git-b0fe89caeb0c37405874bad66702f49ff4977972.zip | |
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 'diff-tree.c')
0 files changed, 0 insertions, 0 deletions