Merge Behaving Differently on Different Computers, Losing Changes

[Jensen, Aaron]

Yes.

-----Original Message-----
From: Pierre-Yves David [mailto:pierre-yves.david at ens-lyon.org] 
Sent: Friday, June 26, 2015 12:23 PM
To: Jensen, Aaron; mercurial at selenic.com
Subject: Re: Merge Behaving Differently on Different Computers, Losing Changes



On 06/26/2015 10:25 AM, Jensen, Aaron wrote:
> In what is probably completely obvious to everyone else, the problem 
> was our merge tool, Beyond Compare 3. The other two developers were on 
> an old version (3.1.11) and I was on the latest (3.3.13). Looks like 
> there was a bug that caused Bad Merges. In hindsight, Duh. Of course 
> it was the merge tool. I feel stupid.

I'm happy you figured it out.

I assume than upgrading them to the latest version made the bad merging dissapear ?

--
Pierre-Yves David