Christoph Bartoschek wrote:
> Am Donnerstag, 11. Februar 2010 schrieb Neels J Hofmeyr:
>> Hi Christoph,
>>
>> it would be nice if you could provide a way to reproduce this issue. I am
>> aware that this can be some work, and we would highly appreciate it. :)
>
> Hi,
>
> here is the script. When i
Am Donnerstag, 11. Februar 2010 schrieb Neels J Hofmeyr:
> Hi Christoph,
>
> it would be nice if you could provide a way to reproduce this issue. I am
> aware that this can be some work, and we would highly appreciate it. :)
Hi,
here is the script. When it comes to choosing the merge operation I
Hi Christoph,
it would be nice if you could provide a way to reproduce this issue. I am
aware that this can be some work, and we would highly appreciate it. :)
I too have seen some weird conflict markings and it would be nice to get a
handle on them. But we need to be able to reproduce them befor
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(o
