test-merge5: remove obsolete '-y' and its motivating comment
The '-y' in 'hg update -y' was once needed to answer questions about
modify/delete conflicts. That is no longer needed, so remove the '-y'
and the comment justifying its use.
--- a/tests/test-merge5.t Fri Oct 17 11:01:05 2014 -0400
+++ b/tests/test-merge5.t Thu Oct 09 16:57:45 2014 -0700
@@ -26,13 +26,9 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv a c
-In theory, we shouldn't need the "-y" below, but it prevents this test
-from hanging when "hg update" erroneously prompts the user for "keep
-or delete".
-
Should abort:
- $ hg update -y 1
+ $ hg update 1
abort: uncommitted changes
(commit or update --clean to discard changes)
[255]
@@ -40,5 +36,5 @@
Should succeed:
- $ hg update -y 1
+ $ hg update 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved