Author: stsp
Revision: 1846855
Modified property: svn:log
Modified: svn:log at Sun Nov 18 19:52:20 2018
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sun Nov 18 19:52:20 2018
@@ -6,5 +6,5 @@ option, which is now made available due
* subversion/iibsvn_client/conflicts-test.c
(test_merge_incoming_delete_vs_local_delete): Expect the 'ignore deletion'
option to show up. The new logic to toggle this option since r1846851
- may need more consideration, but the providing the option isn't harmful
+ may need more consideration, but providing the option isn't harmful
so make this test expect it for now.
