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