Repo.py, always select the remote source when hg update detects a conflict in the substates.