annotate tests/test-merge4.out @ 1440:bf109779f48b

Fix relative pull in a subdir
author tonfa@arakou.lan
date Mon, 24 Oct 2005 17:41:45 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source