diff tests/test-pull @ 1883:b98160cfb2f3

give more info to hgmerge script.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 10 Mar 2006 23:34:02 -0800
parents ffb584a182d1
children 85daa4e03b4c
line wrap: on
line diff