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

[Matt Mackall]

On Thu, 2011-05-26 at 13:58 +0200, Adrian Buehlmann wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1306235416 -7200
> # Node ID c365abdd8ec568b5aeaa658a7765c5969c005801
> # Parent  0969d91fad5cad68bcf60f85e2e3286acd11ab52
> rebase: hard-code 'hg pull --rebase' to use internal:fail merge tool
> 
> If there were changes that modified the same files in both the local and the
> pulled line of development, the rebase part of 'pull --rebase' will then
> be aborted (example):

This breaks perfectly reasonable rebases that would normally fly by
without any interaction because the internal merge just worked, while
internal:fail doesn't even try. I really can't see us changing the
default behavior here.

-- 
Mathematics is the supreme nostalgia of our time.