3 Commits

Author SHA1 Message Date
Martin Baeuml ad05875f0b Implement a more general version of the merge command
Also, add tests for this command.

This fixes #71.
2014-04-15 23:21:05 +02:00
Martin Baeuml d6a66eb0e6 remove empty file 2014-04-15 22:39:00 +02:00
Martin Baeuml 87fd2f04a3 add test script for testing the annotationmodel with ModelTest 2011-06-17 14:27:46 +02:00