Mercurial > hg
comparison hgext/censor.py @ 48753:d9af7c1fb619
simplemerge: let filemerge check for binary inputs
This is similar to the previous patch, but here we put a specialized
copy of `simplemerge._verifytext()` in the the `filemerge` module
instead.
Differential Revision: https://phab.mercurial-scm.org/D12147
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 10 Feb 2022 15:27:58 -0800 |
parents | 5105a9975407 |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
48752:109fec7bf7de | 48753:d9af7c1fb619 |
---|