diff tests/test-pull-permission.out @ 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 937ee88da3ef
children 3053fc33f545
line wrap: on
line diff