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 /commit.c | |
| parent | 2f72ebfcd02b06a19e6c5429fcfc78b5fc754144 (diff) | |
| parent | b2b1f615ce3b9383a32dec7f84488284004224f3 (diff) | |
| download | git-9c65991abd7c954be8c3a1414f6cf365b83ee317.tar.gz | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions