diff tests/test-conflict.out @ 1714:eabfbd220f39

fix hgrc doc hook descriptions.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 11 Feb 2006 00:31:52 -0800
parents 5a034646e472
children 7544700fd931
line wrap: on
line diff