changeset 27163 | 27b89a0957ec |
parent 26927 | 0829ed3b75e1 |
child 27597 | fe150586d9bd |
--- a/tests/test-commit-amend.t Mon Nov 30 11:17:18 2015 -0800 +++ b/tests/test-commit-amend.t Mon Nov 30 13:43:55 2015 -0800 @@ -812,7 +812,7 @@ $ hg ci -m aa $ hg merge -q bar local changed aa which remote deleted - use (c)hanged version or (d)elete? c + use (c)hanged version, (d)elete, or leave (u)nresolved? c $ hg ci -m 'merge bar (with conflicts)' $ hg log --config diff.git=1 -pr . changeset: 33:97a298b0c59f