When dumping hunks because of a merge "1 to != 2 from" mismatch, use the new hunk dump function.