Mercurial > public > mercurial-scm > hg-stable
diff tests/test-diff-color.t @ 38592:be441eb65f09
diff: graduate word-diff option from experimental
Per 4.6 Sprint notes.
I've also made it gated by "formatchanging" since it could change the output
if we had an option to highlight words without using colors.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 08 Jul 2018 16:21:26 +0900 |
| parents | 35632d392279 |
| children | b07b691d2667 |
line wrap: on
line diff
--- a/tests/test-diff-color.t Fri Jul 06 12:47:02 2018 -0700 +++ b/tests/test-diff-color.t Sun Jul 08 16:21:26 2018 +0900 @@ -304,7 +304,7 @@ > three of those lines have > collapsed onto one > EOF - $ hg diff --config experimental.worddiff=False --color=debug + $ hg diff --config diff.word-diff=False --color=debug [diff.diffline|diff --git a/file1 b/file1] [diff.file_a|--- a/file1] [diff.file_b|+++ b/file1] @@ -337,7 +337,7 @@ [diff.deleted|-(to see if it works)] [diff.inserted|+three of those lines have] [diff.inserted|+collapsed onto one] - $ hg diff --config experimental.worddiff=True --color=debug + $ hg diff --config diff.word-diff=True --color=debug [diff.diffline|diff --git a/file1 b/file1] [diff.file_a|--- a/file1] [diff.file_b|+++ b/file1] @@ -384,7 +384,7 @@ > EOF $ hg ci -m 'slightly change utf8 char' utf8 - $ hg diff --config experimental.worddiff=True --color=debug -c. + $ hg diff --config diff.word-diff=True --color=debug -c. [diff.diffline|diff --git a/utf8 b/utf8] [diff.file_a|--- a/utf8] [diff.file_b|+++ b/utf8]