equal
deleted
inserted
replaced
122 |
122 |
123 Test marking/unmarking copies in merge commit |
123 Test marking/unmarking copies in merge commit |
124 |
124 |
125 $ hg copy --forget --at-rev . b2 |
125 $ hg copy --forget --at-rev . b2 |
126 abort: cannot mark/unmark copy in merge commit |
126 abort: cannot mark/unmark copy in merge commit |
127 [255] |
127 [10] |
128 |
128 |
129 $ hg copy --after --at-rev . b1 b2 |
129 $ hg copy --after --at-rev . b1 b2 |
130 abort: cannot mark/unmark copy in merge commit |
130 abort: cannot mark/unmark copy in merge commit |
131 [255] |
131 [10] |
132 |
132 |
133 $ cd .. |
133 $ cd .. |