view tests/test-cat.out @ 2903:013921c753bd

merge with other head by default, not tip. fixes issue 339.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 15 Aug 2006 11:38:07 -0700
parents 7544700fd931
children
line wrap: on
line source

adding a
adding b
0
0
0
a: No such file in rev 03f6b0774996
1