Mercurial > hg
comparison .hgignore @ 48752:109fec7bf7de
simplemerge: let extension check for binary inputs (unless `--text`)
The `simplemerge` module does too much UI-related things. This patch
puts a specialized copy of `simplemerge._verifytext()` in the
simplemerge extension.
Differential Revision: https://phab.mercurial-scm.org/D12146
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 10 Feb 2022 13:36:09 -0800 |
parents | 3e23794b9e1c |
children | e8138eba17ee |
comparison
equal
deleted
inserted
replaced
48751:59c6724ddccb | 48752:109fec7bf7de |
---|