[clang] [C] Update -Wimplicit-void-ptr-cast for null pointer constants (PR #138271)

[Erich Keane via cfe-commits]

================
@@ -13958,7 +13979,11 @@ QualType Sema::CheckAssignmentOperands(Expr *LHSExpr, ExprResult &RHS,
           LHSType->isObjCObjectPointerType())))
       ConvTy = AssignConvertType::Compatible;
 
+<<<<<<< HEAD
----------------
erichkeane wrote:

bad merge!  Below too

https://github.com/llvm/llvm-project/pull/138271