tests/test-merge2.t
changeset 44252 1850066f9e36
parent 16913 f2719b387380
child 45846 8d72e29ad1e0
--- a/tests/test-merge2.t	Fri Jan 24 16:05:11 2020 -0800
+++ b/tests/test-merge2.t	Fri Jan 24 17:49:21 2020 -0800
@@ -50,4 +50,8 @@
   adding b
   created new head
 
+  $ hg merge 'wdir()'
+  abort: merging with the working copy has no effect
+  [255]
+
   $ cd ..