| changeset 45739 | 693da1b928af |
| parent 44396 | acbfa31cfaf2 |
| child 45760 | e0ad11ab8052 |
| 45738:5df1655edf42 | 45739:693da1b928af |
|---|---|
802 $ hg revert -aq |
802 $ hg revert -aq |
803 |
803 |
804 --no-commit can't be used with --merge |
804 --no-commit can't be used with --merge |
805 |
805 |
806 $ hg backout --merge --no-commit 2 |
806 $ hg backout --merge --no-commit 2 |
807 abort: cannot use --merge with --no-commit |
807 abort: cannot specify both --no-commit and --merge |
808 [255] |
808 [255] |