Mercurial > hg > ConflictEditor
log
age | author | description |
---|---|---|
2011-09-13 | Dirk Olmes | rename the button to find conflicts |
2011-09-12 | Dirk Olmes | ignore unwanted files |
2011-09-12 | Dirk Olmes | use a special table cell renderer that displays otherwise hidden special characters (\n for now) |
2011-09-12 | Dirk Olmes | group the conflicts list and the differences table in a split view |
2011-09-12 | Dirk Olmes | implement exception handling listeners, when selecting a conflict document, display all differences |
2011-09-12 | Dirk Olmes | retrieve conflicts and show them in a very simple form in a JList |
2011-09-12 | Dirk Olmes | basic GUI (not yet connected) for connecting to a DB and showing conflicts |
2011-09-12 | Dirk Olmes | use a Difference object to describe the diff |
2011-09-12 | Dirk Olmes | first drop of the conflict editor - mostly model work |
No more entries |