Skip to content

Passed

org.eclipse.egit.ui.internal.external.tools.ExternalMergeToolUiTest.testExternalMergeTool

Took 1.2 sec.

Standard Output

!ENTRY org.eclipse.egit.ui 2 0 2024-06-17 22:19:00.768
!MESSAGE Failed to run external merge tool.
!STACK 0
org.eclipse.jgit.internal.diffmergetool.ToolException: JGit: tool execution return code: 1
checkExitCode: true
execError: false
stderr: 

	at org.eclipse.jgit.internal.diffmergetool.CommandExecutor.run(CommandExecutor.java:90)
	at org.eclipse.jgit.internal.diffmergetool.MergeTools.merge(MergeTools.java:207)
	at org.eclipse.jgit.internal.diffmergetool.MergeTools.merge(MergeTools.java:164)

...[truncated 3532 chars]...
ernal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
	at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:659)
	at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596)
	at org.eclipse.equinox.launcher.Main.run(Main.java:1467)
	at org.eclipse.equinox.launcher.Main.main(Main.java:1440)

Standard Error

[WorkbenchTestable] WARN org.eclipse.jgit.lib.Repository - close() called when useCnt is already zero for Repository[/home/jenkins/agent/workspace/egit/tmp/egit.tmp/d5fe2c0e715d459c9f4b98249086e3aa/LocalRepositoriesTests64_testExternalMergeTool/FirstRepository/.git]