diff tests/test-merge3 @ 691:61c6b4178b9e

HG environment variables take precedence over hgrc manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
author mpm@selenic.com
date Wed, 13 Jul 2005 01:48:03 -0800
parents 2fe8d66e3075
children 7e4843b7efd2
line wrap: on
line diff