Take care not to show null-diffs with the "diff" command when the checkout
contains the results of a merge.
Ticket [47d4e76139fd63]