* STATUS (1.14.x): Nominate r1892118.

stspdotname · stspdotname · commit 134f9fc93142 · 2025-05-13T15:37:32.000Z
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.14.x@1925534 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS b/STATUS
@@ -30,6 +30,13 @@ Candidate changes:
   Votes:
     +1: jamessan
 
+* r1892118
+  Fix a NULL pointer dereference in the conflict resolver.
+  Justification:
+    1.14.5 users are running into this crash.
+  Votes:
+   +1: stsp
+
 Veto-blocked changes:
 =====================
 
