diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-02 15:07:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-02 15:07:19 -0800 |
| commit | 48d5f25ddd9812fc78632357d062894342dc55df (patch) | |
| tree | 7ad506259d202b1c8e7f18fb29dcd667792a1c9a /diff.c | |
| parent | 8c22bd9ff9d4a355d3546181698307a797fd2bd2 (diff) | |
| parent | fb1c18fc466c6a9c6ea1b072c9db93c0046f4cbd (diff) | |
| download | git-48d5f25ddd9812fc78632357d062894342dc55df.tar.gz | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions