rebase usability

[anatoly techtonik]

Hi,

My pull request was rejected and now I want to rebase it on top
(anchor it at tip).

    >hg rebase -b .
    merging MANIFEST.in
    merging sphinx/quickstart.py
    warning: conflicts during merge.
    merging sphinx/quickstart.py incomplete! (edit conflicts, then use
'hg resolve --mark')
    unresolved conflicts (see hg resolve, then hg rebase --continue)

In sphinx/quickstart I see this:

    BATCHFILE = 'make.bat.tpl'
    \techo.  coverage   to run coverage check of the documentation if enabled
   <<<<<<< dest
    \tgoto end
    )
    ... skipped ~200 lines
    =======
    >>>>>>> source

I realize that I removed these lines, but I don't get where and why
there is conflict? Somebody added them or what? How to see the exact
changes that cause the conflict from each side?

I'd like to see at clashing edits or at least revisions that are
clashing, but there is no such info. It is also quite hard to
understand what is dest and source - a more detailed explanation
`<<<<< common lines changed in destination revision XXX`, `>>>>>
common lines changed in revision YYY that is being rebased` would be
better.

Right now I don't see other way than to cloning repo once more, switch
to dest branch, and run `hg blame` to see where these lines were
changes. Feel very ugly to me. Is there a better way?
-- 
anatoly t.