Mercurial > hg > ConflictEditor
graph
-
Clean up connecting the widgets2011-09-13, by Dirk Olmes
-
rename the button to find conflicts2011-09-13, by Dirk Olmes
-
ignore unwanted files2011-09-12, by Dirk Olmes
-
use a special table cell renderer that displays otherwise hidden special characters (\n for now)2011-09-12, by Dirk Olmes
-
group the conflicts list and the differences table in a split view2011-09-12, by Dirk Olmes
-
implement exception handling listeners, when selecting a conflict document, display all differences2011-09-12, by Dirk Olmes
-
retrieve conflicts and show them in a very simple form in a JList2011-09-12, by Dirk Olmes
-
basic GUI (not yet connected) for connecting to a DB and showing conflicts2011-09-12, by Dirk Olmes
-
use a Difference object to describe the diff2011-09-12, by Dirk Olmes
-
first drop of the conflict editor - mostly model work2011-09-12, by Dirk Olmes