log tests/test-merge.py @ 49:3d7e0325ba1c

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