Mercurial > hg > ConflictEditor
graph
-
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
-
wire up the current value, conflict value and preview buttonsSun, 18 Sep 2011 11:00:16 +0200, by dirk
-
pull the buttons into their own panel so they can be activated/deactivated in a single operationSun, 18 Sep 2011 10:13:48 +0200, by dirk
-
change column namesSun, 18 Sep 2011 09:40:58 +0200, by dirk
-
do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.Sun, 18 Sep 2011 09:37:40 +0200, by dirk
-
toString of Difference should properly quote the values and not quote null fields.Sat, 17 Sep 2011 09:28:13 +0200, by dirk
-
helper class for playing around with JSONSat, 17 Sep 2011 09:22:30 +0200, by dirk
-
better assertionsSat, 17 Sep 2011 07:10:23 +0200, by dirk
-
implement hashCode and equals for DifferenceSat, 17 Sep 2011 07:05:41 +0200, by dirk
-
tighten up checksSat, 17 Sep 2011 06:55:38 +0200, by dirk
-
clean code!Sat, 17 Sep 2011 06:49:13 +0200, by dirk
-
generate differences for missing keys either in the original document or in the conflicting document.Fri, 16 Sep 2011 17:03:57 +0200, by dirk
-
implement a test case for DocumentMatcher that covers the currently implemented casesFri, 16 Sep 2011 11:38:15 +0200, by dirk