From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 16 Sep 2019 22:42:26 +0000 (+0200)
Subject: Merge branch 'stable-5.5'
X-Git-Tag: v5.6.0.201911271000-m3~114
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7be05205ddfacc8a6d7445604629a4a4f6a3f90b;p=jgit.git

Merge branch 'stable-5.5'

* stable-5.5:
  WorkingTreeIterator: handle different timestamp resolutions

Change-Id: I61df7392d8826ab526c39da2a8718723a1cc602a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

7be05205ddfacc8a6d7445604629a4a4f6a3f90b