log conflict-editor/pom.xml @ 14:f2daf738299f

age author description
Fri, 16 Sep 2011 11:38:15 +0200 dirk implement a test case for DocumentMatcher that covers the currently implemented cases
Mon, 12 Sep 2011 11:47:48 +0200 Dirk Olmes first drop of the conflict editor - mostly model work