annotate tests/bundles/issue6528.hg-v2 @ 48584:74973a6d4e67

filemerge: always define a "base" label It simplifies the code and improves the conflict markers to always have the "base" label defined. Differential Revision: https://phab.mercurial-scm.org/D12016
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 14:13:12 -0800
parents c30ca163b45e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
47821
c30ca163b45e issue6528: also filter delta on the fly when applying a changegroup
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
1 (binary:application/octet-stream)