diff options
Diffstat (limited to 'subversion/libsvn_wc/entries.c')
| -rw-r--r-- | subversion/libsvn_wc/entries.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subversion/libsvn_wc/entries.c b/subversion/libsvn_wc/entries.c index 1be6a8bec870..5748aa3cb857 100644 --- a/subversion/libsvn_wc/entries.c +++ b/subversion/libsvn_wc/entries.c @@ -1800,7 +1800,7 @@ write_entry(struct write_baton **entry_node, normal replace+copied base base+work add+copied replace+copied work work+work - although obviously the node is a directory rather then a file. + although obviously the node is a directory rather than a file. There are then more conversion states where the parent is replaced. @@ -2004,7 +2004,7 @@ write_entry(struct write_baton **entry_node, if (entry_node && entry->tree_conflict_data) { /* Issues #3840/#3916: 1.6 stores multiple tree conflicts on the - parent node, 1.7 stores them directly on the conflited nodes. + parent node, 1.7 stores them directly on the conflicted nodes. So "((skel1) (skel2))" becomes "(skel1)" and "(skel2)" */ svn_skel_t *skel; |