tree cb4c66ff42070a2afda0f05a9c90c6e9c0c5db18
parent 16a4bf10359edf34a7c62d6466dab2e33060d332
parent fb1c18fc466c6a9c6ea1b072c9db93c0046f4cbd
author Junio C Hamano <gitster@pobox.com> 1584482543 -0700
committer Junio C Hamano <gitster@pobox.com> 1584482543 -0700

Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint

The merge-recursive machinery failed to refresh the cache entry for
a merge result in a couple of places, resulting in an unnecessary
merge failure, which has been fixed.

* en/t3433-rebase-stat-dirty-failure:
  merge-recursive: fix the refresh logic in update_file_flags
  t3433: new rebase testcase documenting a stat-dirty-like failure