diff tests/test-conflict.out @ 1890:d4545f1b8bfa

fix contrib/mercurial.spec for hgext
author Xiaofeng Ling <xiaofeng.ling@intel.com>
date Sun, 12 Mar 2006 15:07:40 +0100
parents 5a034646e472
children 7544700fd931
line wrap: on
line diff