Mercurial > hg

diff tests/test-merge6.t @ 42668:52a383451739

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unshelve: add abort on using continue and interactive together `unshelve --continue --interactive` will not work as expected by the user as the mode of in-progress unshelve is preserved and cannot be overwritten. This patch makes `unshelve` to throw an error on using both `--continue` and `--interactive` together with `unshelve`. Differential Revision: https://phab.mercurial-scm.org/D6703
author Navaneeth Suresh <navaneeths1998@gmail.com>
date Tue, 30 Jul 2019 21:36:15 +0530
parents d0abd7949ea3
children
line wrap: on
line diff