DESCRIPTION

Don't use 3 way compare if the common ancestor is same as one side

Bug: 512395
Change-Id: I2231e143d6f4f349d11cc2332077bf57391af558
Signed-off-by: Jayvion Booth xxx@xxx.xxx


COMMENTS

author: Brenden Conley
date: 2017-02-24 18:48:44.000000000

Patch Set 3:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/9611/

-------------------------------------
author: Brenden Conley
date: 2017-02-24 19:11:43.000000000

Patch Set 3: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/9611/ : SUCCESS

-------------------------------------
author: Jayvion Booth
date: 2017-02-24 19:43:17.000000000

Patch Set 3:

> Yes, that fixes the problem. Note that there are two more problems:
 > 
 > 1. (Compare editor): if I do apply all non-conflicting changes, the
 > left side updates and jumps to the first line. The scroll position
 > in the right side stays where it was. Ideally, either the left side
 > shouldn't jump to the top, or the right side also should.
 
This is unrelated to the change. If I compare two unrelated files and apply all changes I see exact same behavior.

 > 2. EGit bug 425592. I'll see if I can do something about that one.

Yep, I've seen this one too, but this is also unrelated.

-------------------------------------
author: Gerrit Johnathan Pham
date: 2017-02-24 19:45:44.000000000

Change has been successfully merged into the git repository by Jayvion Booth

-------------------------------------
author: Alayna Houston
date: 2017-02-26 08:22:48.000000000

Patch Set 3:

Didn't know one could submit a change without a +2...

-------------------------------------
author: Jayvion Booth
date: 2017-02-26 08:26:37.000000000

Patch Set 3:

> Didn't know one could submit a change without a +2...

Admins seem to broke gerrit for jgit and egit, see 
https://git.eclipse.org/r/91825 and the bug.

-------------------------------------
