On Fri, Aug 11, 2017 at 09:26:14PM +, Blaine Whittle wrote:
> I'm seeing different behavior with automatic conflict resolver when operating
> against a 1.10.0-alpha3 compared to a 1.7.10 server. I'm using a
> 1.10.0-alpha3 client.
>
> Test case
>
> * Create branch B from branch A.
>
I'm seeing different behavior with automatic conflict resolver when operating
against a 1.10.0-alpha3 compared to a 1.7.10 server. I'm using a 1.10.0-alpha3
client.
Test case
* Create branch B from branch A.
* Checkout branch B.
* Modify file contents in branch B + commit.
* Mo
