Mercurial > hg > ConflictEditor
graph
-
basic GUI (not yet connected) for connecting to a DB and showing conflictsMon, 12 Sep 2011 13:31:59 +0200, by Dirk Olmes
-
use a Difference object to describe the diffMon, 12 Sep 2011 12:03:28 +0200, by Dirk Olmes
-
first drop of the conflict editor - mostly model workMon, 12 Sep 2011 11:47:48 +0200, by Dirk Olmes