reset automerge after resolving conflicts
Merged revisions 577-579 via svnmerge from
https://svn.three-dimensional.net/mvblog/trunk
........
r577 | michiel | 2007-09-02 21:18:07 +0200 (Sun, 02 Sep 2007) | 3 lines
keep track of changes.
Also test for the new commit hooks
........
r578 | www-data | 2007-09-02 21:20:51 +0200 (Sun, 02 Sep 2007) | 2 lines
remove empty line to test commit hooks
........
r579 | michiel | 2007-09-02 21:30:31 +0200 (Sun, 02 Sep 2007) | 2 lines
bogus menu item to test automerge conflicts
........
