Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-content-divergent-basic.t
changeset 5123 900668a93629
parent 5079 1f92a6aa40d6
child 5163 1752a2e7a226
child 5323 417503ef667d 
--- a/tests/test-evolve-content-divergent-basic.t	Sun Feb 02 16:18:18 2020 +0100
+++ b/tests/test-evolve-content-divergent-basic.t	Tue Jan 14 20:20:13 2020 +0700
@@ -1000,7 +1000,7 @@
   @  8c2a6aae4bc5 (5) E4
   |
   x    aae293050980 (4) <<<<<<< divergent
-  |\     rewritten(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     reworded(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   | |      diff -r aae293050980 -r 8c2a6aae4bc5 changeset-description
   | |      --- a/changeset-description
   | |      +++ b/changeset-description
evolve