show-diff: don't print out the full "ce" format for unmerged files