diff tests/test-rebase-conflicts.t @ 42532:12243f15d53e

statecheck: added support for STATES This removes `STATES` from `state.py` and adds support to `statecheck` class to handle its features. `getrepostate()` function is modified accordingly. This adds a method 'cmdutil.addunfinished()' for appending to the unfinishedstate list so as to keep 'merge' and 'bisect' at the last. This also makes two separate message formats for `checkunfinished()` and `getrepostate()` as there were previously present. Results of test changed are shown. Differential Revision: https://phab.mercurial-scm.org/D6503
author Taapas Agrawal <taapas2897@gmail.com>
date Sun, 09 Jun 2019 02:12:58 +0530
parents 341bddf88ac5
children c7d236b55a3e
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Sun Jun 09 01:13:13 2019 +0530
+++ b/tests/test-rebase-conflicts.t	Sun Jun 09 02:12:58 2019 +0530
@@ -82,6 +82,7 @@
   
   # To continue:    hg rebase --continue
   # To abort:       hg rebase --abort
+  # To stop:        hg rebase --stop
   
 
 Try to continue without solving the conflict: