( )⚙ D12378 tests: demonstrate how conflict markers end up $local *and* $output

This is an archive of the discontinued Mercurial Phabricator instance.

tests: demonstrate how conflict markers end up $local *and* $output
ClosedPublic

Authored by martinvonz on Mar 15 2022, 4:52 PM.

Details

Summary

When a merge tool is configured to keep conflict markers, they are
supposed to be written to $local if $output is not mentioned in
the tool's merge-tools.<tool>.args config, and in $output if it is
mentioned. However, I broke the latter case in D12190.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.