Author: rhuijben
Revision: 1448162
Modified property: svn:log
Modified: svn:log at Wed Feb 20 13:44:21 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Feb 20 13:44:21 2013
@@ -10,5 +10,5 @@ kinds of tree conflicts.
open_directory,
add_directory,
open_file,
- add_file): Don't skip nodes that are already shadowed via their
- parents when they are conflicted.
+ add_file): Don't skip conflicted nodes when their parents are shadowed as in
+ this case the conflict just applies to WORKING.
