Mercurial > hg > ConflictEditor
log
| age | author | description |
|---|---|---|
| Sun, 18 Sep 2011 11:27:55 +0200 | dirk | the current conflict is an ObjectNode now so there's less need for casts |
| Sun, 18 Sep 2011 11:00:16 +0200 | dirk | wire up the current value, conflict value and preview buttons |
| Sun, 18 Sep 2011 10:13:48 +0200 | dirk | pull the buttons into their own panel so they can be activated/deactivated in a single operation |
| Sun, 18 Sep 2011 09:40:58 +0200 | dirk | change column names |
| Sun, 18 Sep 2011 09:37:40 +0200 | 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:35:43 +0200 | dirk | directly compare the JsonNode objects that are returned as values for a given field name. Difference needs to preserve them so that the JsonNodes can be used when merging conflict JSON documents later. |
| Sat, 17 Sep 2011 09:28:13 +0200 | dirk | toString of Difference should properly quote the values and not quote null fields. |