Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information