HomePhabricator

merge: add a back_out() function to encapsulate update()

Authored by martinvonz.

Description

merge: add a back_out() function to encapsulate update()

I've sent several earlier patches adding merge.clean_update(),
merge.merge() etc, one function for each use case. This patch
continues that work. I plan to hide the complex update() eventually.

Differential Revision: https://phab.mercurial-scm.org/D9064

Details