comparison doc/hgmerge.1.txt @ 951:859de3ebc041

Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 18 Aug 2005 21:35:36 +0100
parents c084cfbb2389
children 3ab6e55ee361
comparison
equal deleted inserted replaced
950:fbaf0380efd1 951:859de3ebc041