Mercurial Mercurial > mercurial / 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-rebase-newancestor.t
changeset 39284 975d959295ef
parent 39277 f785073f792c
child 39285 a3fd84f4fb38 
--- a/tests/test-rebase-newancestor.t	Tue Aug 14 17:00:32 2018 +0000
+++ b/tests/test-rebase-newancestor.t	Sat Aug 25 21:17:34 2018 +0300
@@ -133,7 +133,7 @@
   note: rebase of 1:1d1a643d390e created no changes to commit
   rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
   rebasing 4:4b019212aaf6 "dev: merge default"
-  file f-default was deleted in other [source] but was modified in local [dest].
+  file 'f-default' 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? c
   rebasing 6:9455ee510502 "dev: merge default"
@@ -163,7 +163,7 @@
   > EOF
   rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
   rebasing 4:4b019212aaf6 "dev: merge default"
-  file f-default was deleted in other [source] but was modified in local [dest].
+  file 'f-default' 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? c
   rebasing 6:9455ee510502 "dev: merge default"
mercurial