diff tests/test-merge2.t @ 44427:4ce2330f2d0b

phabricator: also check parent fctx for binary where it is checked for UTF-8 I don't know that this is necessary, but it seems obvious from the code checking both the current and parent file for UTF-8 content that this was the intent. Differential Revision: https://phab.mercurial-scm.org/D8221
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 20 Feb 2020 10:56:40 -0500
parents 1850066f9e36
children 8d72e29ad1e0
line wrap: on
line diff