# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1450903280 28800
# Node ID fe150586d9bd7e9a00f3317f6113cb5c72466b74
# Parent  c881367688fe8eb8a3b32f5baa3b2d6e148efa13
tests: explicitly request changed version in c/d conflict in test-commit-amend.t

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.

diff -r c881367688fe -r fe150586d9bd tests/test-commit-amend.t
--- a/tests/test-commit-amend.t	Wed Dec 23 12:41:20 2015 -0800
+++ b/tests/test-commit-amend.t	Wed Dec 23 12:41:20 2015 -0800
@@ -810,7 +810,9 @@
   $ hg up -q default
   $ echo aa >> aa
   $ hg ci -m aa
-  $ hg merge -q bar
+  $ hg merge -q bar --config ui.interactive=True << EOF
+  > c
+  > EOF
   local changed aa which remote deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? c
   $ hg ci -m 'merge bar (with conflicts)'