diff --git a/tests/test-merge1.t b/tests/test-merge1.t index e012a20061ed50d2c8e9fc6553c89381d928ca65_dGVzdHMvdGVzdC1tZXJnZTEudA==..3ac1735a2265a1f0d0f5ea47a5e428e09c8b581d_dGVzdHMvdGVzdC1tZXJnZTEudA== 100644 --- a/tests/test-merge1.t +++ b/tests/test-merge1.t @@ -28,7 +28,7 @@ $ mkdir b $ hg up - abort: Is a directory: '$TESTTMP/t/b' + abort: *: '$TESTTMP/t/b' (glob) [255] $ hg ci abort: last update was interrupted