Checkout
stsp
committed
on 11 Oct 16
On the 'resolve-incoming-add' branch: Make a FAILing test PASS again.

* subversion/tests/libsvn_client/conflicts-test.c
(test_merge_incom… Show more
On the 'resolve-incoming-add' branch: Make a FAILing test PASS again.

* subversion/tests/libsvn_client/conflicts-test.c

 (test_merge_incoming_added_dir_merge2): Account for the nested

  'add vs add' tree conflict on the new file, and for the change

  in property conflict behaviour (to be investigated later).

Show less