Mercurial > evolve
diff tests/test-evolve-phase-divergence.t @ 4822:e50596ff2ddb stable
tests: demonstrate too many spaces in olog -p output with word-diff
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 30 Aug 2019 11:28:02 +0700 |
| parents | b6c819facbe8 |
| children | c16fed4908d8 |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Tue Aug 06 19:27:54 2019 +0200 +++ b/tests/test-evolve-phase-divergence.t Fri Aug 30 11:28:02 2019 +0700 @@ -1412,6 +1412,10 @@ $ hg init cancelled-changes $ cd cancelled-changes + $ cat << EOF > .hg/hgrc + > [diff] + > word-diff = yes + > EOF $ cat << EOF > numbers > 1 > 2 @@ -1594,8 +1598,8 @@ a b c - -D - +d + - D + + d e f g @@ -1606,12 +1610,12 @@ 1 2 3 - -four - +4 + - four + + 4 5 6 - -7 - +seven + - 7 + + seven 8 nine diff -r 3074c7249d20 -r 599454370881 romans @@ -1619,8 +1623,8 @@ +++ b/romans Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +1,5 @@ I - -II - +ii + - II + + ii III IV V @@ -1782,8 +1786,8 @@ a b c - -D - +d + - D + + d e f g @@ -1794,12 +1798,12 @@ 1 2 3 - -four - +4 + - four + + 4 5 6 - -7 - +seven + - 7 + + seven 8 nine diff -r 3074c7249d20 -r 599454370881 romans @@ -1807,8 +1811,8 @@ +++ b/romans Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +1,5 @@ I - -II - +ii + - II + + ii III IV V