view tests/test-simplemerge.py.out @ 42761:5c285c8e4f98

unshelve: abort on using --keep and --interactive together I am working on making interactive mode support `--keep` flag. Until we support the usage of `--interactive` and `--keep` together, let us abort on it. Differential Revision: https://phab.mercurial-scm.org/D6699
author Navaneeth Suresh <navaneeths1998@gmail.com>
date Thu, 15 Aug 2019 20:43:25 +0530
parents f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK