Mercurial > hg
diff tests/test-dirstate-race.t @ 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 | e845537f6adb |
children |