Mercurial > hg > ConflictEditor
graph
-
implement resolving the conflictSun, 18 Sep 2011 19:06:59 +0200, by dirk
-
fix a bug with selection in the differences tableSun, 18 Sep 2011 11:28:20 +0200, by dirk
-
the current conflict is an ObjectNode now so there's less need for castsSun, 18 Sep 2011 11:27:55 +0200, by dirk