--- a/tests/test-rebase-newancestor.t Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-rebase-newancestor.t Sun Aug 26 19:14:26 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 local [dest] but was modified in other [source].
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 local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"