Junio C Hamano 5e9d9787d2 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

2019-07-25 13:59:24 -07:00

10 KiB

Raw Blame History

View Raw