Source:
public void testCHER002() throws Exception { setupCHER002(); runCherryPick(Returns.ABORTED, "branch_c", "branch_d"); assertOutputMessageEnd(getExpectedConflictMessage("[" + getShortId("branch_c") + "]... Delete C1")); assertNoConflitMarker(projectPath.resolve("model.uml"), projectPath.resolve("model.notation")); project = new ProjectBuilder(this) .clean(true) .addContentToCopy("data/conflicts/CHER_002/conflict/resolution1/model.di") .addContentToCopy("data/conflicts/CHER_002/conflict/resolution1/model.uml") .addContentToCopy("data/conflicts/CHER_002/conflict/resolution1/model.notation") .create(projectPath); getGit().add().addFilepattern(".").call(); runContinue(Returns.ABORTED); assertOutputMessageEnd(getExpectedConflictMessage("[" + getShortId("branch_d") + "]... Delete C2", "[" + getShortId("HEAD") + "] Delete C1")); project = new ProjectBuilder(this) .clean(true) .addContentToCopy("data/conflicts/CHER_002/conflict/resolution2/model.di") .addContentToCopy("data/conflicts/CHER_002/conflict/resolution2/model.uml") .addContentToCopy("data/conflicts/CHER_002/conflict/resolution2/model.notation") .create(projectPath); getGit().add().addFilepattern(".").call(); runContinue(Returns.COMPLETE); assertOutputMessageEnd(getCompleteMessage("[" + getShortId("HEAD") + "] Delete C2")); List<RevCommit> revCommits = Lists.newArrayList(getGit().log().setMaxCount(3).add(getHeadCommit()) .call()); assertEquals("Delete C2", revCommits.get(0).getShortMessage()); assertEquals("Delete C1", revCommits.get(1).getShortMessage()); assertEquals("Adds Attr1 to C1 and adds Attr2 to C2", revCommits.get(2).getShortMessage()); }

Target:
public void testCHER002() throws Exception { setupCHER002(); runCherryPick(Returns.ABORTED, "branch_c", "branch_d"); assertOutputMessageEnd(getExpectedConflictMessage("[" + getShortId("branch_c") + "]... Delete C1")); assertNoConflitMarker(projectPath.resolve("model.uml"), projectPath.resolve("model.notation")); project = new ProjectBuilder(this) .clean(true) .addContentToCopy("data/conflicts/CHER002/conflict/resolution1/model.di") .addContentToCopy("data/conflicts/CHER002/conflict/resolution1/model.uml") .addContentToCopy("data/conflicts/CHER002/conflict/resolution1/model.notation") .create(projectPath); getGit().add().addFilepattern(".").call(); runContinue(Returns.ABORTED); assertOutputMessageEnd(getExpectedConflictMessage("[" + getShortId("branch_d") + "]... Delete C2", "[" + getShortId("HEAD") + "] Delete C1")); project = new ProjectBuilder(this) .clean(true) .addContentToCopy("data/conflicts/CHER002/conflict/resolution2/model.di") .addContentToCopy("data/conflicts/CHER002/conflict/resolution2/model.uml") .addContentToCopy("data/conflicts/CHER002/conflict/resolution2/model.notation") .create(projectPath); getGit().add().addFilepattern(".").call(); runContinue(Returns.COMPLETE); assertOutputMessageEnd(getCompleteMessage("[" + getShortId("HEAD") + "] Delete C2")); List<RevCommit> revCommits = Lists.newArrayList(getGit().log().setMaxCount(3).add(getHeadCommit()) .call()); assertEquals("Delete C2", revCommits.get(0).getShortMessage()); assertEquals("Delete C1", revCommits.get(1).getShortMessage()); assertEquals("Adds Attr1 to C1 and adds Attr2 to C2", revCommits.get(2).getShortMessage()); }