tree 7ad506259d202b1c8e7f18fb29dcd667792a1c9a
parent 8c22bd9ff9d4a355d3546181698307a797fd2bd2
parent fb1c18fc466c6a9c6ea1b072c9db93c0046f4cbd
author Junio C Hamano <gitster@pobox.com> 1583190439 -0800
committer Junio C Hamano <gitster@pobox.com> 1583190439 -0800

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

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