--- a/tests/test-graft.t Fri Apr 12 12:20:38 2019 -0400
+++ b/tests/test-graft.t Fri Apr 12 09:41:08 2019 -0700
@@ -1059,8 +1059,8 @@
$ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit
grafting 3:b69f5839d2d9 "D0"
note: possible conflict - f3b was renamed multiple times to:
+ f3a
f3d
- f3a
warning: can't find ancestor for 'f3d' copied from 'f3b'!
Set up the repository for some further tests
@@ -1126,8 +1126,8 @@
$ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit
grafting 3:b69f5839d2d9 "D0"
note: possible conflict - f3b was renamed multiple times to:
+ f3d
f3e
- f3d
merging f4e and f4a to f4e
warning: can't find ancestor for 'f3d' copied from 'f3b'!