]> sipb.mit.edu Git - ikiwiki.git/commitdiff
* Improve use of svn merge, by specifying the file to merge, rather than
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 28 Jan 2007 00:06:01 +0000 (00:06 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 28 Jan 2007 00:06:01 +0000 (00:06 +0000)
  chdiring to the srcdir (which wasn't right when merging in a subdir).
  Thanks Ethan.


No differences found