annotate tests/test-merge4.out @ 1417:90b62337f8dd

hgweb: add a mercurial link to the footer
author Matt Mackall <mpm@selenic.com>
date Thu, 20 Oct 2005 00:26:24 -0700
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source