Mercurial > hg > ConflictEditor
log
| age | author | description |
|---|---|---|
| Fri, 16 Sep 2011 17:03:57 +0200 | dirk | generate differences for missing keys either in the original document or in the conflicting document. |
| Fri, 16 Sep 2011 11:38:15 +0200 | dirk | implement a test case for DocumentMatcher that covers the currently implemented cases |
| Tue, 13 Sep 2011 08:24:35 +0200 | Dirk Olmes | add button panel |
| Tue, 13 Sep 2011 04:10:29 +0200 | Dirk Olmes | clean code: pull build/create methods apart |
| Tue, 13 Sep 2011 03:29:11 +0200 | Dirk Olmes | switch to GridBagLayout |
| Tue, 13 Sep 2011 02:33:01 +0200 | Dirk Olmes | 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:20:11 +0200 | Dirk Olmes | Clean up connecting the widgets |
| Tue, 13 Sep 2011 02:07:14 +0200 | Dirk Olmes | rename the button to find conflicts |