Problems during merge

Hi,

after a merge with conflicts I completely wrong conflict markers:

======================= inv_merge.C =============================
...
   } else {
<<<<<<< .working
=======
      _cur.sinks(to_polarity(other)).append(csol.sinks());
>>>>>>> .merge-right.r13821

      _cur.sinks(to_polarity(other)).append(csol.sinks());

      Time slew_limit =
...
==================================================================

In my working copy there is:

======================= inv_merge.C.working ======================
...
   } else {

      _cur.sinks(to_polarity(other)).append(csol.sinks());

      Time slew_limit =
...
==================================================================

The right part only differs in an empty line:

=============== inv_merge.C.merge-right.r13821 ===================
...
   } else {
      _cur.sinks(to_polarity(other)).append(csol.sinks());

      Time slew_limit =
...
==================================================================

In the left part we have:

=============== inv_merge.C.merge-left.r13820 ===================
...
   } else {
      _cur.sinks(to_polarity(other)).append_slice(csol.sinks().begin(),
                                                  csol.sinks().size());

      TimePair slew_limit =
...
==================================================================

I would have expected that I see the code of the left part in the merge view
and not two times the code from working.

What is going wrong here?

Christoph
Received on 2010-02-10 14:00:40 CET