Checkout
kfogel
committed
on 07 Nov 08
On the issue-2843-dev branch: resolve conflicts from the r34098 merge.

* subversion/libsvn_wc/entries.c
(read_entries): Resolve conflict … Show more
On the issue-2843-dev branch: resolve conflicts from the r34098 merge.

* subversion/libsvn_wc/entries.c

 (read_entries): Resolve conflict between r31713 and r34093.

Show less