comparison hglib/util.py @ 46:ebcc5d7dd528

client: introduce merge handlers These can control the behaviour when Mercurial prompts what to do with regard to a specific file
author Idan Kamara <idankk86@gmail.com>
date Tue, 16 Aug 2011 23:58:24 +0300
parents 19d2c55c3928
children 3d7e0325ba1c
comparison
equal deleted inserted replaced
45:191855a9d813 46:ebcc5d7dd528