Revision 9c65991abd7c954be8c3a1414f6cf365b83ee317 authored by Junio C Hamano on 29 July 2019, 19:38:17 UTC, committed by Junio C Hamano on 29 July 2019, 19:38:17 UTC
"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
2 parent s 2f72ebf + b2b1f61
History
File Mode Size
.gitattributes -rw-r--r-- 34 bytes
LICENSE.txt -rw-r--r-- 1.2 KB
sha1.c -rw-r--r-- 56.4 KB
sha1.h -rw-r--r-- 4.0 KB
ubc_check.c -rw-r--r-- 46.7 KB
ubc_check.h -rw-r--r-- 1.7 KB

back to top