diff hglib/merge.py @ 50:bd7dfd94b0d9

client: use util.reterrorhandler
author Idan Kamara <idankk86@gmail.com>
date Thu, 18 Aug 2011 16:20:23 +0300
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line diff