Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 31: (0) -30 -10 -4 +4 +10 tip
age author description
Tue, 20 Sep 2011 17:00:45 +0200 dirk Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
Tue, 20 Sep 2011 16:18:42 +0200 dirk as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
Sun, 18 Sep 2011 19:06:59 +0200 dirk implement resolving the conflict
Sun, 18 Sep 2011 11:28:20 +0200 dirk fix a bug with selection in the differences table
less more | rev 31: (0) -30 -10 -4 +4 +10 tip