Manual merge for some files during rebase (using TortoiseHg)

[Afriza N. Arief]

Hi,

I have project files within my repository (let's say *.proj), unfortunately,
the order of the (text) content is not consistent and if I use Kdiff3 (which
is the default since I'm using TortoiseHg's installer) to merge, it can
easily lead to corrupted project file. So what I do during a merge is to
take a good copy from one side, try to compile the projects, and fix the
project's settings using IDE.

However, when I do rebase, it automatically commits when I "Choose B
everywhere", save, and close KDiff3. Is there any settings or flags I can
pass to hg rebase such that I can review and fix some stuffs before
committing it?

Best Regards,

Afriza N. Arief
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20091026/cd3c289a/attachment.htm