diff hglib/merge.py @ 63:939d1d763bb1

client: add resolve command
author Idan Kamara <idankk86@gmail.com>
date Fri, 19 Aug 2011 22:52:59 +0300
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line diff