Mercurial > hg > ConflictEditor
graph
-
clean up: ConflictEditor should only contain code that mediates between the various GUI elements. The logic for dealing with conflicts moves to ConflictEditorController.Tue, 13 Sep 2011 02:33:01 +0200, by Dirk Olmes
-
Clean up connecting the widgetsTue, 13 Sep 2011 02:20:11 +0200, by Dirk Olmes
-
rename the button to find conflictsTue, 13 Sep 2011 02:07:14 +0200, by Dirk Olmes
-
ignore unwanted filesTue, 13 Sep 2011 01:55:28 +0200, by Dirk Olmes
-
use a special table cell renderer that displays otherwise hidden special characters (\n for now)Mon, 12 Sep 2011 15:58:20 +0200, by Dirk Olmes
-
group the conflicts list and the differences table in a split viewMon, 12 Sep 2011 15:50:00 +0200, by Dirk Olmes
-
implement exception handling listeners, when selecting a conflict document, display all differencesMon, 12 Sep 2011 14:27:04 +0200, by Dirk Olmes
-
retrieve conflicts and show them in a very simple form in a JListMon, 12 Sep 2011 13:49:42 +0200, by Dirk Olmes