mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
d6688cc959
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).
24 lines
416 B
Plaintext
24 lines
416 B
Plaintext
*** 'a\nc\n\n\n\n' 'a\nb\n\n\n'
|
|
*** 'a\nb\nc\n' 'a\nc\n'
|
|
*** '' ''
|
|
*** 'a\nb\nc' 'a\nb\nc'
|
|
*** 'a\nb\nc\nd\n' 'a\nd\n'
|
|
*** 'a\nb\nc\nd\n' 'a\nc\ne\n'
|
|
*** 'a\nb\nc\n' 'a\nc\n'
|
|
*** 'a\n' 'c\na\nb\n'
|
|
*** 'a\n' ''
|
|
*** 'a\n' 'b\nc\n'
|
|
*** 'a\n' 'c\na\n'
|
|
*** '' 'adjfkjdjksdhfksj'
|
|
*** '' 'ab'
|
|
*** '' 'abc'
|
|
*** 'a' 'a'
|
|
*** 'ab' 'ab'
|
|
*** 'abc' 'abc'
|
|
*** 'a\n' 'a\n'
|
|
*** 'a\nb' 'a\nb'
|
|
6 6 'y\n\n'
|
|
6 6 'y\n\n'
|
|
9 9 'y\n\n'
|
|
done
|