Mercurial - status produces wrong slashes on Windows

If you don't like it, then a quick fix (for 0.9.3):



Line 768 in C:\Python24\Lib\site-packages\mercurial\util.py:

def localpath(path):

return path.replace('/', '\\')

Replace it with:

def localpath(path):

return path

Mercurial - kdiff3 - hgmerge

Context: Windows, MSYS, Mercurial installed from source



Problem: hgmerge will use "merge" to merge even if kdiff3 is present



Solution: edit x:/Python24/Scripts/hgmerge and remove the following line (and the corresponding fi should be eliminated too):



if [ -n "$DISPLAY" ]; then