tests/test-merge1.out
author mpm@selenic.com
Sat, 27 Aug 2005 16:28:53 -0700
changeset 1101 2cf5c8a4eae5
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
Separate out old-http support - create new statichttprepo class - pull remote bits out of localrepo - pull remote bits out of util.opener - switch hg.repository to use statichttprepo

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b