Mercurial > hg > ConflictEditor
graph
-
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences tableTue, 20 Sep 2011 17:47:59 +0200, by dirk
-
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)Tue, 20 Sep 2011 17:21:03 +0200, by dirk
-
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSONTue, 20 Sep 2011 17:00:45 +0200, by dirk
-
as per Jackson recommendation, don't use Reader objects but instead use just plain input streamTue, 20 Sep 2011 16:18:42 +0200, by dirk
-
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