From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 20:59:24 +0000 (-0700)
Subject: Merge branch 'jc/denoise-rm-to-resolve'
X-Git-Tag: v2.23.0-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e9d9787d278331385dbfcf962b32dc4e8d3eb5e?hp=--cc

Merge branch 'jc/denoise-rm-to-resolve'

"git rm" to resolve a conflicted path leaked an internal message
"needs merge" before actually removing the path, which was
confusing.  This has been corrected.

* jc/denoise-rm-to-resolve:
rm: resolving by removal is not a warning-worthy event
---

5e9d9787d278331385dbfcf962b32dc4e8d3eb5e