Author: stsp
Revision: 1618024
Modified property: svn:log
Modified: svn:log at Thu Aug 14 19:23:34 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Aug 14 19:23:34 2014
@@ -1,5 +1,5 @@
For tree conflicts flagged during merges, record the proper node kinds
-of the the versions of nodes involved in the conflict (the local working
+of the versions of nodes involved in the conflict (the local working
copy node kind, the merge-left node kind, and the merge-right node kind).
Before this change misleading node kind information was recorded.,
