From c566e16d9ee1d925626b24bb84f497ffba88986a Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 28 Jan 2007 00:06:01 +0000 Subject: * 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. --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 483d14b12..7a0e362d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,11 @@ ikiwiki (1.41) UNRELEASED; urgency=low * Make gitorigin_branch and gitmaster_branch configurable via the setup file. Closes: #408599 * French translation update. Closes: #408593 + * 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. - -- Joey Hess Sat, 27 Jan 2007 18:56:49 -0500 + -- Joey Hess Sat, 27 Jan 2007 19:01:27 -0500 ikiwiki (1.40) unstable; urgency=low -- cgit v1.2.3