--- a/tests/test-rebase-newancestor.t Mon Nov 30 11:17:18 2015 -0800
+++ b/tests/test-rebase-newancestor.t Mon Nov 30 13:43:55 2015 -0800
@@ -134,7 +134,7 @@
rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default"
remote changed f-default which local deleted
- use (c)hanged version or leave (d)eleted? c
+ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-backup.hg (glob)
$ hg tglog
@@ -161,7 +161,7 @@
rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default"
remote changed f-default which local deleted
- use (c)hanged version or leave (d)eleted? c
+ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-backup.hg (glob)
$ hg tglog