[PATCH 1 of 1] rebase: hard-code 'hg pull --rebase' to use internal:fail merge tool

[Sune Foldager]

On 2011-05-26 15:18, Adrian Buehlmann wrote:
>On 2011-05-26 14:55, Sune Foldager wrote:
>> Right.. but that's kinda a third workflow on top of rebase and merge isn't it?
>> I mean, at Edlund, no one knows about resolve. People either use rebase or
>> merge and resolve all conflicts in kdiff3. Ok, SOME people know, but many
>> don't. Not sure this makes it easier.
>
>Didn't you claim that you guys don't use rebase --pull? So I think you
>shouldn't be affected by this patch.

No, we don't, but I can still have an opinion on the workflow :). You claimed
you didn't use it either :p.