log hglib/merge.py @ 99:2b36619ec0a0

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