When doing qpush, can I get a merge tool instead of .rej files?

Question

I've recently start using mq, which is a great way of working. One thing that annoys me slightly is that when I qpush back my patches after doing a pull and update, I end up with .rej files if there are conflicts.

It would be nice if Mercurial could just open TortoiseMerge so I can resolve the conflicts as quickly as possible, instead of having to open the .rej files one by one and do it in a more manual, slower way.

Even svn-style conflicts markers inside the files would be easier to work with than the .rej files.

Is there a way around those .rej files?

Answer 1

hg pull --rebase works, as long as you want to rebase your patches onto a newer base. You need have the patches you want to rebase qpushed. If the revision you want to rebase on is already in your repo, strip it and pull from the strip-backup bundle.