aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/OSGI-INF
diff options
context:
space:
mode:
authorIvan Frade <ifrade@google.com>2024-12-04 14:56:41 -0800
committerIvan Frade <ifrade@google.com>2024-12-04 14:56:41 -0800
commita960da9866ea86a6909911d7249a1bbfe1b628ac (patch)
treee86b049ab296b33c448cd1a3a12f710a998bdfdf /org.eclipse.jgit/OSGI-INF
parentbb2bca135793a53779e5cdaf930fb3317e63f0aa (diff)
downloadjgit-a960da9866ea86a6909911d7249a1bbfe1b628ac.tar.gz
jgit-a960da9866ea86a6909911d7249a1bbfe1b628ac.zip
MergeToolTest: update expected error from the tool
This test fails in jenkins becuase the error string is slightly different. It seems to come from an external tool (git mergetool?) that maybe changed that output (?). At the moment update the error string to match the output of the tool. Parsing error messages is bound to be flaky. Change-Id: I81e9bf65088b893af3a0d8e53d57052583fc2262
Diffstat (limited to 'org.eclipse.jgit/OSGI-INF')
0 files changed, 0 insertions, 0 deletions