If you get conflicts during an update (let's ignore "merge" for the moment), the
conflict resolver gives you a (d)iff option. This diff is between the
pre-update "base" file and the merged-with-conflict markers file. If the update
managed to merge lots of stuff in cleanly but conflicted on a few small parts,
this will show an enormous diff where only a few parts are even in conflict.
While this might be useful in some cases, we at least should consider the option
of, eg, the diff between the file you'd get if you chose all of the left choices
and the file you'd get if you chose all of the right choices.
Bug
Major