diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:17 -0700 |
| commit | 9c65991abd7c954be8c3a1414f6cf365b83ee317 (patch) | |
| tree | c1b9516750692954a948cc7beafdea1088b00378 /contrib | |
| parent | Merge branch 'js/mingw-spawn-with-spaces-in-path' into maint (diff) | |
| parent | rm: resolving by removal is not a warning-worthy event (diff) | |
| download | tgif-9c65991abd7c954be8c3a1414f6cf365b83ee317.tar.xz | |
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
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions