log
graph
tags
bookmarks
branches
changeset
browse
zip
help
Mercurial
>
hg
>
ConflictEditor
graph
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
less
more
| rev 33:
(0)
-30
-10
-6
+6
tip
The revision graph only works with JavaScript-enabled browsers.
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
2011-09-20
, by dirk
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)
2011-09-20
, by dirk
Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
2011-09-20
, by dirk
as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
2011-09-20
, by dirk
implement resolving the conflict
2011-09-18
, by dirk
fix a bug with selection in the differences table
2011-09-18
, by dirk
less
more
| rev 33:
(0)
-30
-10
-6
+6
tip