Mercurial > hg > ConflictEditor
log
age | author | description |
---|---|---|
Mon, 12 Sep 2011 15:58:20 +0200 | Dirk Olmes | use a special table cell renderer that displays otherwise hidden special characters (\n for now) |
Mon, 12 Sep 2011 15:50:00 +0200 | Dirk Olmes | group the conflicts list and the differences table in a split view |
Mon, 12 Sep 2011 14:27:04 +0200 | Dirk Olmes | implement exception handling listeners, when selecting a conflict document, display all differences |
Mon, 12 Sep 2011 13:49:42 +0200 | Dirk Olmes | retrieve conflicts and show them in a very simple form in a JList |