--- a/tests/test-copytrace-heuristics.t Tue Aug 14 17:00:32 2018 +0000
+++ b/tests/test-copytrace-heuristics.t Sat Aug 25 21:17:34 2018 +0300
@@ -86,7 +86,7 @@
$ hg rebase -s . -d 1
rebasing 2:d526312210b9 "mode a" (tip)
- file a was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in other [source] but was modified in local [dest].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -243,7 +243,7 @@
$ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
rebasing 2:ef716627c70b "mod a" (tip)
skipping copytracing for 'a', more candidates than the limit: 7
- file a was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in other [source] but was modified in local [dest].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -699,7 +699,7 @@
$ hg rebase -s 8b6e13696 -d .
rebasing 1:8b6e13696c38 "added more things to a"
- file a was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in other [source] but was modified in local [dest].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)