merge plug in

[Yuya Nishihara]

On Tue, 21 Jun 2016 20:08:46 +0200, yota moteuchi wrote:
> But mercurial merge plug-in mechanics are file based, I did not found a way
> to change the order (.ann should be merged after .saofd choices, and .etp
> at the end) nor skip or force merge on some specific files. Nor a way to
> remember merge choices made in a previous file… (.ann merge depends on
> choice made on .saofd)
> 
> Ideally I would be interested in doing a merge at the repository/directory
> level, choosing what to merge manually, what to process automatically. But
> I don't know how...

I don't know the detail, but there's an experimental mechanism called
"merge driver". I guess that's what you need.

https://selenic.com/repo/hg/log?rev=merge+driver