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

* r1853450
Enable 'incoming_move_file_merge' option only if local change is file edit.
Justification:
Show more
Merge r1853450 from trunk:

* r1853450

  Enable 'incoming_move_file_merge' option only if local change is file edit.

  Justification:

    Conflict resolver misbehaves when it runs into move vs move conflicts.

  Votes:

    +1: stsp

Show less