view tests/test-cat.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 c6ffedc4f11b
children 7544700fd931
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 7040230c159c
1