Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1140:04d52b446e5e
Don't create repo objects in hgwebdir, ui object is enough.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 29 Aug 2005 07:19:02 +0200 |
parents | 5a034646e472 |
children | 67a28636ea64 |
line wrap: on
line source
merging for b merging b This is file b1 merging for b merging b merging for b merging b