diff tests/test-conflict @ 2615:b075216da118

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