Mercurial > hg > ConflictEditor
log
age | author | description |
---|---|---|
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 |