diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-14 16:10:33 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-14 16:10:33 -0500 |
| commit | 1c06aed378e579b7396937fdff4e38ea0482ff5b (patch) | |
| tree | 75213d0c600e1733030cf154d8268f7692ecd33a /debian | |
| parent | 8f7d7c1a00d65fcdb1482f5e8ce334be752c3db4 (diff) | |
* monotone: Add code to default mergerc file to run
_MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
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 <josh@freedesktop.org> Sun, 10 Feb 2008 13:18:58 -0800 |