From: Amitai Schlair Date: Mon, 23 Jan 2012 01:49:34 +0000 (-0500) Subject: Merge branch 'master' of git://git.ikiwiki.info X-Git-Tag: 3.20120202~53^2 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/354e4aaa04eedaa02e99aa670b807d0da41c5f47?hp=f9ff7c7aaeeae9d9c5cde5dedf33b6b7c60ecadc Merge branch 'master' of git://git.ikiwiki.info --- diff --git a/doc/rcs/cvs/discussion.mdwn b/doc/rcs/cvs/discussion.mdwn index 645b2388b..2df2c1317 100644 --- a/doc/rcs/cvs/discussion.mdwn +++ b/doc/rcs/cvs/discussion.mdwn @@ -147,3 +147,15 @@ short and clear as possible. --[[schmonz]] > that. --[[Joey]] >> Done. --[[schmonz]]. + +---- + +I'm attempting to bring some polish to this plugin, starting with +fuller test coverage. In preparation, I've refactored the tests a +bunch (and shuffled the code a bit) in my branch. I'm worried, +however, that my misunderstanding of `git rebase` may have made my +branch harder for you to pull. + +Before I go writing a whole swack of test cases, could you merge +my latest? Through at least ad0e56cdcaaf76bc68d1b5c56e6845307b51c44a +there should be no functional change. --[[schmonz]]