diff tests/test-merge6.out @ 2615:b075216da118

contrib: add sample.hgrc
author Rafael Villar Burke <pachi@mmn-arquitectos.com>
date Fri, 14 Jul 2006 22:38:21 -0700
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff