ConflictEditor: revision graph

graph

less more | rev 10: (0) -2 +2 +10 +30 tip

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 widgets
Tue, 13 Sep 2011 02:20:11 +0200, by Dirk Olmes

less more | rev 10: (0) -2 +2 +10 +30 tip