diff mercurial/byterange.py @ 34797:284fa44f7f39

merge: allow user to halt merge on merge-tool failures Depends on D932. Call the new _onfilemergefailure function when a merge tool reports failure via a return code. Differential Revision: https://phab.mercurial-scm.org/D951
author Ryan McElroy <rmcelroy@fb.com>
date Fri, 06 Oct 2017 06:48:43 -0700
parents 1232f7fa00c3
children 6f62a1c3e11d
line wrap: on
line diff