From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:17 +0000 (-0700)
Subject: Merge branch 'jc/denoise-rm-to-resolve' into maint
X-Git-Tag: v2.23.0-rc0~1^2~16
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=9c65991abd7c954be8c3a1414f6cf365b83ee317

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

"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
---

9c65991abd7c954be8c3a1414f6cf365b83ee317