# HG changeset patch # User Anton Shestakov # Date 1567139282 -25200 # Node ID e50596ff2ddbee49cfb73bcb157c1cb18cf859d1 # Parent dd68ce259708640e4fe4b705746a9dbe613f45b9 tests: demonstrate too many spaces in olog -p output with word-diff diff -r dd68ce259708 -r e50596ff2ddb tests/test-evolve-phase-divergence.t --- 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