Mercurial > hg
changeset 27597:fe150586d9bd
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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 23 Dec 2015 12:41:20 -0800 |
| parents | c881367688fe |
| children | 97e39f70fb47 |
| files | tests/test-commit-amend.t |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)'