Manual merge for some files during rebase (using TortoiseHg)

[Benoit Boissinot]

On Mon, Oct 26, 2009 at 10:56:55AM +0800, Afriza N. Arief wrote:
> 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?

I'm sorry, I don't know. Maybe you'll have more luck asking directly in
the THG mailing list?

http://bitbucket.org/tortoisehg/stable/wiki/Home#mailing-lists

regards,

Benoit

-- 
:wq