comparison hgmerge @ 3549:db946221a58a

Some clarifications for pull/push protocols: - List file:// and static-http:// - Mention that you can pull from bundle files - List http and https as valid push targets, but emphasize that this feature has to be enabled.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 27 Oct 2006 15:56:34 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3548:88b4755fa48f 3549:db946221a58a