]> source.dussan.org Git - jgit.git/commitdiff
Merge changes Ideaefd51,I6c347393
authorHan-Wen NIenhuys <hanwen@google.com>
Tue, 9 Aug 2022 09:10:53 +0000 (05:10 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Tue, 9 Aug 2022 09:10:53 +0000 (05:10 -0400)
* changes:
  Reapply "Create util class for work tree updating in both filesystem and index."
  ResolveMerger: add coverage for inCore file => directory transition


Trivial merge