[PATCH 0 of 1] Select internal conflict resolution tool with a merge option

[Sune Foldager]

On 07-03-2010 17:17, Mads Kiilerich wrote:

> Merge tools - including internal:* - is currently only used when merging
> at the file level. I am not sure it is a good idea to use the merge-tool
> concept for manifest merge as well.

I tend to agree; we don't want to conflate these concepts here.

> But I do agree that it could be nice to have more options for
> controlling the manifest merge.

Yeah I guess... although dummy merges could maybe be called an advanced
use case, so people can use debugsetparents? :p

/Sune