[PATCH 0 of 1] merge: confirm continuation when conflict of divergent operations is detected

[FUJIWARA Katsunori]

This patch series adds intervention point for divergent renaming at
"hg merge".

In many cases, divergent renaming detected at "hg merge" may be
ignored, because they show just warning messages: especially for users
using TortoiseHg with "Automatically advance to next page ...."
checking, warning/notice messages are shown only in a moment.

But, merging with divergent renaming shouldn't succeed silently,
because unexpected divergence may confuse users long after merging
from the point of view of consistency in source tree.