Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 4: (0) tip
age author description
Mon, 12 Sep 2011 14:27:04 +0200 Dirk Olmes implement exception handling listeners, when selecting a conflict document, display all differences
Mon, 12 Sep 2011 13:49:42 +0200 Dirk Olmes retrieve conflicts and show them in a very simple form in a JList
Mon, 12 Sep 2011 13:31:59 +0200 Dirk Olmes basic GUI (not yet connected) for connecting to a DB and showing conflicts
Mon, 12 Sep 2011 12:03:28 +0200 Dirk Olmes use a Difference object to describe the diff
Mon, 12 Sep 2011 11:47:48 +0200 Dirk Olmes first drop of the conflict editor - mostly model work
less more | rev 4: (0) tip