* 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)
commitc566e16d9ee1d925626b24bb84f497ffba88986a
treefa28441137d7aa168c9a0a0a6ea139235a94f7b4
parent62462ca5fbf273549f00a7936b10898cb611c528
* 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.
IkiWiki/Rcs/svn.pm
debian/changelog
doc/patchqueue/merge_patch.mdwn [deleted file]