test-copy-move-merge.t: explicitly request changed version
We're going to change the default for this in an upcoming patch, but in this
instance we do want to continue picking the changed version.
--- a/tests/test-copy-move-merge.t Sat Dec 26 19:40:38 2015 -0800
+++ b/tests/test-copy-move-merge.t Wed Dec 23 12:41:20 2015 -0800
@@ -80,7 +80,9 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob)
$ hg up -qC 2
- $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True
+ $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF
+ > c
+ > EOF
rebasing 2:add3f11052fa "other" (tip)
remote changed a which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c