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-public-content-divergent-discard.t
changeset 4583 4fcf9a71befc
parent 4582 985d4c1336f6
child 4584 fd8dada76730 
--- a/tests/test-evolve-public-content-divergent-discard.t	Wed Apr 24 20:32:01 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-discard.t	Wed Apr 17 21:16:17 2019 +0530
@@ -93,6 +93,7 @@
   merging "other" content-divergent changeset '90522bccf499'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content-divergent changesets differ by descriptions only, discarding 90522bccf499
+  content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499
 
   $ hg evolve -l
 
@@ -186,6 +187,7 @@
   merging "other" content-divergent changeset 'ae3429430ef1'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content-divergent changesets differ by descriptions only, discarding ae3429430ef1
+  content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1
 
   $ hg evolve -l
evolve