log mercurial/hg.py @ 428:183c87d4e1a0

age author description
Tue, 21 Jun 2005 20:40:53 -0800 mpm Fix typo in merging new files
Sun, 19 Jun 2005 20:16:10 +0100 Thomas Arendsen Hein Allow hgrc's proxy host and $http_proxy env var to start with http://
Sat, 18 Jun 2005 21:56:31 +0100 Thomas Arendsen Hein Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Tue, 21 Jun 2005 19:36:35 -0800 mpm [PATCH] rename under the other OS
Tue, 21 Jun 2005 19:33:13 -0800 mpm [PATCH] Repo locator fix for the other `OS'
Tue, 21 Jun 2005 19:31:13 -0800 mpm [PATCH] file seperator handling for the other 'OS'
Tue, 21 Jun 2005 19:28:53 -0800 mpm Minor tweak to binary mode patch
Tue, 21 Jun 2005 19:25:05 -0800 mpm [PATCH] file type fixes for the other 'OS'
Tue, 21 Jun 2005 19:19:39 -0800 mpm [PATCH] Removal of a file added by merging branches
Tue, 21 Jun 2005 19:14:11 -0800 mpm [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
Tue, 21 Jun 2005 19:07:13 -0800 mpm remove double assignment
Tue, 21 Jun 2005 19:06:17 -0800 mpm [PATCH]: Typo in localrepository.update
Tue, 21 Jun 2005 18:48:28 -0800 mpm [PATCH] Merging files that are deleted in both branches
Tue, 21 Jun 2005 18:41:57 -0800 mpm [PATCH] Merging identical changes from another branch