Feature Request: improve merging of .hgsub

[Dirkjan Ochtman]

On Tue, Aug 10, 2010 at 12:11, Mads Kiilerich <mads at kiilerich.com> wrote:
> On the other side ... .hgsub is a user-edited file with a lot of flexibility
> in the syntax. Automatic merging of that file comes pretty close to
> automatic editing of hgrc - and I doubt that is something "we" like.

Automatic editing is very different that in principle we always expect
merges to be reviewed. We might be able to give off a warning message
when we automatically merge it, to encourage review.

Cheers,

Dirkjan