I (Julian Foad) wrote:
> I (Julian Foad) wrote on 2013-04-15:
>> Mattias Engdegård wrote:
>>> If a file has both text and property conflicts, only resolving one of
>>> them leads to an incorrect conflict summary message.
[...]
> The solution I'm implementing is to make the conflict resolver callba
I (Julian Foad) wrote on 2013-04-15:
> Mattias Engdegård wrote:
>> If a file has both text and property conflicts, only resolving one of them
>> leads to an incorrect conflict summary message.
>
> I'll take this one. There's a bunch of stuff to sort out, here; marking
> both conflicts as resolv
Mattias Engdegård wrote:
> If a file has both text and property conflicts, only resolving one of them
> leads
> to an incorrect conflict summary message.
I'll take this one. There's a bunch of stuff to sort out, here; marking both
conflicts as resolved at the same time is only one of the bugs
3 matches
Mail list logo
