Mercurial > hg

comparison mercurial/win32.py @ 34797:284fa44f7f39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d5b2beca16c0
children 2062f7c2ac83
comparison
equal deleted inserted replaced
34796:ed91846c29cf 34797:284fa44f7f39