DESCRIPTION

Fixed 'Merges do not appear to be using --no-ff flag'

- use non-ff for finish operations on branches with multiple commits
- extended tests

Bug: 473639
Signed-off-by: Jamarion Hunt xxx@xxx.xxx
Change-Id: I7a7c3a57a78930f95c0775f99eed2e99bf856544


COMMENTS

author: Jamarion Hunt
date: 2015-09-02 21:14:00.000000000

Uploaded patch set 7: Commit message was updated.

-------------------------------------
author: Brenden Conley
date: 2015-09-02 21:51:11.000000000

Patch Set 7:

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

-------------------------------------
author: Brenden Conley
date: 2015-09-02 22:13:33.000000000

Patch Set 7: Verified+1

Build Successful 

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

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-09-09 09:13:20.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

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