Merge branch 'jc/denoise-rm-to-resolve'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:24 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:24 +0000 (13:59 -0700)
"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

1  2 
builtin/rm.c
t/t3600-rm.sh

diff --cc builtin/rm.c
Simple merge
diff --cc t/t3600-rm.sh
Simple merge