tree 9b6a73a83c2b6603d8e21b1c60d3b169e7a0fde7
parent fd7966d9e462f0d48b87cef21b8c19dca84df242
parent 197688b953f07e20662894e13f0f90f48c945d17
author Matthias Sohn <matthias.sohn@sap.com> 1761704720 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1761704720 +0100

Merge branch 'stable-7.4'

* stable-7.4:
  InterruptTimer: don't use Yoda-style condition
  InterruptTimer: avoid expensive notify when begin is soon after end
  InterruptTimer: avoid unneeded notify for end()
  Disable MergeToolTest#testEmptyToolName
  Add InterruptTimer Tests
  Allow to discover bitmap on disk created after the packfile
  Prepare 5.13.6-SNAPSHOT builds
  JGit v5.13.5.202508271544-r
  Remove resolver option from target-platform-configuration
  Add missing release property to maven build
  Suppress API errors for minor API changes in service releases
  Remove unnecessary casts

Change-Id: I662bf9782e418a4d1c037fdd0bc3a02e0a8e5c44