DESCRIPTION

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

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

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


COMMENTS

author: Douglas Trujillo
date: 2015-09-09 08:50:29.000000000

Uploaded patch set 13: Patch Set 12 was rebased.

-------------------------------------
author: Brenden Conley
date: 2015-09-09 08:50:35.000000000

Patch Set 13:

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

-------------------------------------
author: Douglas Trujillo
date: 2015-09-09 08:50:54.000000000

Patch Set 13: Code-Review+2

ok, got it

-------------------------------------
author: Brenden Conley
date: 2015-09-09 09:12:20.000000000

Patch Set 13: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/7568/ : 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

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