comparison i18n/pt_BR.po @ 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 a00580bc135f
children 6a0e1d593bdd f432e2064a74
comparison
equal deleted inserted replaced
34796:ed91846c29cf 34797:284fa44f7f39