From: Han-Wen NIenhuys <hanwen@google.com>
Date: Tue, 9 Aug 2022 09:10:53 +0000 (-0400)
Subject: Merge changes Ideaefd51,I6c347393
X-Git-Tag: v6.3.0.202208161710-m3~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4d6c6df108dafd98fe59dfe2a1beffb243a53063;p=jgit.git

Merge changes Ideaefd51,I6c347393

* changes:
  Reapply "Create util class for work tree updating in both filesystem and index."
  ResolveMerger: add coverage for inCore file => directory transition
---

4d6c6df108dafd98fe59dfe2a1beffb243a53063