annotate tests/test-merge4.out @ 1893:6569651a4f1e

Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 12 Mar 2006 20:13:58 +0100
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source