log hglib/merge.py @ 122:e05b0cf920bb

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