Mercurial > hg > ConflictEditor
graph
-
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