>>> >>> "UB" == Uwe Brauer <oub@mat.ucm.es> writes:

>> This could be some cockpit error, but in any case, suggest to report
>> the recipe with the problem to the bug tracker, and then the VC
>> experts will figure out what's wrong.


I repeated the steps, after the merge the vc-dir buffer looks like this 

VC backend : Hg
Working dir: ~/HGTest/1-Merge-Test/
Parent     : 7:623174bf7b0e tip
           :  Now we are ready to merge
Parent     : 5:1e5a4938edf0 
           :  Six
Branch     : default
Commit     : 1 modified (merge)
Update     : (current)
Phases     : 8 draft

                         ./
    edited               test.org


If the cursor is *not* on the line 
    edited               test.org

Then everything is ok, however if the cursor is on that line an error
pops up, also the file has *not* been marked.

I find this counterintuitive to say the least


-- 
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine.