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: Jayvion Booth
date: 2017-02-19 12:02:27.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2017-02-19 12:02:33.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2017-02-19 12:25:42.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Jayvion Booth
date: 2017-02-22 09:45:10.000000000

Patch Set 2: Patch Set 1 was rebased

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

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

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