bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

     1

adding foo

     2

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

     3

adding foo

     4

created new head

     5

   rev    offset  length   base linkrev nodeid       p1           p2

     6

     0         0       0      0       0 b80de5d13875 000000000000 000000000000

     7

     1         0      24      0       1 0376abec49b8 000000000000 000000000000