Mercurial > hg > ConflictEditor
graph
-
add a toplevel pom, make this a reactor build2011-10-09, by Dirk Olmes
-
add a comment why we discard the index here2011-10-07, by dirk
-
implement resolving the conflict2011-09-18, by dirk
-
fix a bug with selection in the differences table2011-09-18, by dirk
-
the current conflict is an ObjectNode now so there's less need for casts2011-09-18, by dirk
-
wire up the current value, conflict value and preview buttons2011-09-18, by dirk
-
change column names2011-09-18, by dirk