This is an archive of the discontinued Mercurial Phabricator instance.

partial-merge: add support for `.args` config (`$local` etc.)
ClosedPublic

Authored by martinvonz on Mar 17 2022, 4:01 PM.

Details

Summary

It will be useful to be able to define custom command-line arguments
per partial merge tool just like we have for regular merge tools. In
particular, I expect the same binary to handle multiple languages, so
it will be useful to be able to pass some argument indicating the
language, or perhaps simply an argument defining a regex that's used
for finding lines to merge as a sorted set.

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.