diff mercurial/minirst.py @ 42604:209f2b8a50dc

abort: removed labels argument from abortmerge() Labels are used to label the code that belongs to `working copy` and `merge rev` in case of a conflicted state. No such labelling is required while aborting merge as conflicted parts are reverted to normal. Differential Revision: https://phab.mercurial-scm.org/D6638
author Taapas Agrawal <taapas2897@gmail.com>
date Thu, 11 Jul 2019 03:08:28 +0530
parents f9cdd732cb58
children 2372284d9457
line wrap: on
line diff