tests/test-rename-after-merge.t
changeset 44367 9dab3fa64325
parent 44365 7c4b98a4e536
child 45827 8d72e29ad1e0
--- a/tests/test-rename-after-merge.t	Thu Dec 26 14:02:50 2019 -0800
+++ b/tests/test-rename-after-merge.t	Fri Dec 20 13:24:46 2019 -0800
@@ -120,10 +120,14 @@
   $ hg log -r tip -C -v | grep copies
   copies:      b2 (b1)
 
-Test unmarking copies in merge commit
+Test marking/unmarking copies in merge commit
 
   $ hg copy --forget --at-rev . b2
-  abort: cannot unmark copy in merge commit
+  abort: cannot mark/unmark copy in merge commit
+  [255]
+
+  $ hg copy --after --at-rev . b1 b2
+  abort: cannot mark/unmark copy in merge commit
   [255]
 
   $ cd ..