diff mercurial/filemerge.py @ 27083:6d5d7ac41ef4

histedit: add forceother constraint For the future 'base' action in histedit we need a verification constraint which will not allow using this action with changes that are currently edited.
author Mateusz Kwapich <mitrandir@fb.com>
date Thu, 12 Nov 2015 16:40:33 -0800
parents e1458049dca5
children 4dc5951df1e4
line wrap: on
line diff