Mercurial > hg > mercurial-crew-with-dirclash
diff hgmerge @ 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 | 6a03cff2b0f5 |
children | e4480f2b61e9 |