On Fri, Jun 06, 2008 at 12:59:30PM +0200, Paolo Bonzini <bonzini@xxxxxxx> wrote: > The new strategy resolves only two heads, and the result of the merge > is always the second head. It can be useful with `rebase --onto`, > because it always resolves conflicts in favor of the commits > being applied. Just wanted to say I like the idea. :-)
Attachment:
pgpoknAD4VCDf.pgp
Description: PGP signature
