From 1c06aed378e579b7396937fdff4e38ea0482ff5b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 14 Feb 2008 16:10:33 -0500 Subject: * monotone: Add code to default mergerc file to run _MTN/ikiwiki-netsync-hook when a commit is merged in from the net. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 02d6aa499..02de6fbbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ ikiwiki (2.40) UNRELEASED; urgency=low * Fix a bug where user A created a page concurrently with user B, and when B previewed it would redirect B to A's new page, losing B's work. Instead, don't redirect and let conflict handling resolve it. + * monotone: Add code to default mergerc file to run + _MTN/ikiwiki-netsync-hook when a commit is merged in from the net. -- Josh Triplett Sun, 10 Feb 2008 13:18:58 -0800 -- cgit v1.2.3