comparison hgmerge @ 3938:20f1c8440c53

sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 19 Dec 2006 15:46:02 +0100
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3937:05c703c281ff 3938:20f1c8440c53