Update jgit

[slarse]

Later versions of jgit break certain test cases in Spork, conflict resolution in particular.

jgit is currently ignored by Dependabot (see #485 (comment)), so when this is resolved a @dependabot unignore command must be issued for jgit.

[wetneb]

I might have a go at this since it's blocking for #496.