Mercurial > hg > ConflictEditor
view conflict-editor/src/test/resources/no-conflicts.json @ 3:84b19f2b1dbb
retrieve conflicts and show them in a very simple form in a JList
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 12 Sep 2011 13:49:42 +0200 |
parents | 6f11757c4811 |
children |