Checkout
Julian Foad
committed
on 18 Jul
Merge r1851920 from trunk:

* r1851920
Remove a useless common ancestor search from the conflict resolver.
Justification:
Curren… Show more
Merge r1851920 from trunk:

* r1851920

  Remove a useless common ancestor search from the conflict resolver.

  Justification:

    Current behaviour is inefficient and could lead to dubious conflicts.

  Votes:

    +1: stsp

Show less