--- a/tests/test-graft.t Fri Dec 03 16:21:46 2021 -0800
+++ b/tests/test-graft.t Fri Dec 03 21:41:43 2021 -0800
@@ -246,8 +246,6 @@
picked tool ':merge' for e (binary False symlink False changedelete False)
merging e
my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
- picked tool ':merge' for e (binary False symlink False changedelete False)
- my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')