retryacceptincludingnextchangeset broken

[jacobilsoe]

retryacceptincludingnextchangeset was recently broken. Now it only accepts nextchangeentry. It should accept change and nextchangeentry together.

[WtfJoke]

Oops, seems like I deleted this one param by accident in a recent commit (02de47d)

[WtfJoke]

Thanks for reporting 👍

[WtfJoke]

This enhancement helped fixing one of some "more advanced" merges, automatically 😄 (as you can see, 6 changesets needed to got accepted together in order to solve the merge)

@ohumbel @reinhapa : It is one of the Wildfly-Merges

01:19:32 - Accepting: 26364: Java7EE Upgrade to JBoss 8 (Wildfly) - Changed structure to start for local development
01:19:32 - Accepting: 28466: Wildfly: build - Improved CH.obj.Application.UnitTesting execution
01:19:32 - Accepting: 28466: Wildfly: build - Re-added clean workspace
01:19:32 - Accepting: 28466: Wildfly: build - Added missing classpath entry
01:19:32 - Accepting: 28466: Wildfly: build - Added some more missing libraries 
01:19:32 - Accepting: 28466: Wildfly: build - Added missing ecore libraries
01:19:32 - Accepting: 29016: Wildfly: PQ Tests according to JBoss4 stream - Merges
01:19:55 - Accepted change 90/671 into working directory
[rc15-01-patch_Integration_Stream_branchpoint 5ea022f] 26364: Java7EE Upgrade to JBoss 8 (Wildfly) - Changed structure to start for local development
11 files changed, 258 insertions(+), 353 deletions(-)
01:19:56 - Commited change in local git repository
01:19:56 - Skipping 28466: Wildfly: build - Improved CH.obj.Application.UnitTesting execution
01:19:56 - Skipping 28466: Wildfly: build - Re-added clean workspace
01:19:56 - Skipping 28466: Wildfly: build - Added missing classpath entry
01:19:56 - Skipping 28466: Wildfly: build - Added some more missing libraries
01:19:56 - Skipping 28466: Wildfly: build - Added missing ecore libraries
01:19:56 - Skipping 29016: Wildfly: PQ Tests according to JBoss4 stream - Merges

However there are still some conflicts, which cant be solved that way. Just wanted to let you guys know.