log tests/test-merge.py @ 117:59cb26bf866e

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