log tests/test-merge.py @ 120:5d3783aebe5f 1.2

age author description
Tue, 16 Aug 2011 23:58:24 +0300 Idan Kamara client: introduce merge handlers
Tue, 16 Aug 2011 23:57:21 +0300 Idan Kamara client: add merge command