From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 28 Jan 2007 00:06:01 +0000 (+0000)
Subject: * Improve use of svn merge, by specifying the file to merge, rather than
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c566e16d9ee1d925626b24bb84f497ffba88986a?hp=c566e16d9ee1d925626b24bb84f497ffba88986a

* Improve use of svn merge, by specifying the file to merge, rather than
  chdiring to the srcdir (which wasn't right when merging in a subdir).
  Thanks Ethan.
---