Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
import doctestimport mercurial.changelog# test doctest from changelogdoctest.testmod(mercurial.changelog)import mercurial.httprepodoctest.testmod(mercurial.httprepo)