log hglib/merge.py @ 134:1b47146a4a2c 1.4

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