Merge branch 'master' into stable-6.4
commitf28474475dbe9451b20353be99974790e7b93122
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 16 Nov 2022 11:24:48 +0000 (16 12:24 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 16 Nov 2022 11:24:48 +0000 (16 12:24 +0100)
tree9be06b09cf472540d578a3cc0d7254140abc96de
parented58b433d2db206e2b3a2ce270ea29cc618e1637
parentaccc5112dd6ec86b1195fd364a23034aa12ea1ff
Merge branch 'master' into stable-6.4

* master:
  [staging] "Compare With Each Other" for unstaged files
  [staging] "Compare With Each Other" for staged files
  Use rename detection in some comparisons
  [tests] Try to stabilize IndexDiffCacheTest again
  Update copyright year in CommitAndDiffComponent
  Fix layout in CommitAndDiffComponent

Change-Id: I15b3dd5c5242e2f0099355c0f3cf6dfad612966b