Mercurial > hg > ConflictEditor
view conflict-editor/src/test/resources/no-conflicts.json @ 0:6f11757c4811
first drop of the conflict editor - mostly model work
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 12 Sep 2011 11:47:48 +0200 |
parents | |
children |