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 src/a.c

     2

moving src/a.c to source/a.c

     3

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

     4

created new head

     5

? src/a.o

     6

merging src/a.c and source/a.c to source/a.c

     7

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

     8

(branch merge, don't forget to commit)

     9

M source/a.c

    10

R src/a.c

    11

? source/a.o