comparison contrib/editmerge @ 43884:5709a9992c2a

update: add some tests for the status quo of morestatus on update conflicts Differential Revision: https://phab.mercurial-scm.org/D7666
author Rodrigo Damazio Bovendorp <rdamazio@google.com>
date Fri, 13 Dec 2019 18:59:26 -0800
parents 612502900a2d
children
comparison
equal deleted inserted replaced
43883:09bcbeacedc7 43884:5709a9992c2a