view tests/test-merge4.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 5a034646e472
children b2ae81a7df29
line wrap: on
line source