Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 2280:09ed44225571
On Windows look for mercurial.ini in $USERPROFILE, too, if available
as os.path.expanduser('~') does not always yield a useful directory.
Based on a patch from Edouard Gomez <ed.gomez@free.fr>
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 14 May 2006 18:24:32 +0200 |
| parents | b2ae81a7df29 |
| children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)