diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 17:37:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 17:37:11 -0700 |
| commit | b8a55ce71d0d46204d64fe35787956e994d2a802 (patch) | |
| tree | c43c0b013e372e640cef38bfaf7402c494d4d9b4 /diff-cache.c | |
| parent | 0a7668e99f513bd481ef6c4bc69995c434b91cb1 (diff) | |
| download | git-b8a55ce71d0d46204d64fe35787956e994d2a802.tar.gz | |
show-diff: don't print out the full "ce" format for unmerged files
It really doesn't make sense, since there are potentially _many_ different
cache entries for an unmerged file. So just do the "U pathname" thing.
Diffstat (limited to 'diff-cache.c')
0 files changed, 0 insertions, 0 deletions