Checkout
kfogel
committed
on 07 Nov 08
On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34097):

svn merge https://svn.collab.net/repos/svn/trunk

There was one… Show more
On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34097):

  svn merge https://svn.collab.net/repos/svn/trunk

There was one conflict.  I am committing it with conflict markers

intact, to be resolved in a separate revision:

  subversion/libsvn_wc/entries.c

Show less