The fourteenth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.43.0.txt b/Documentation/RelNotes/2.43.0.txt
index a8f946116303947c356d6350358b46dd14234cb2..7f46b10ed960c699adc8a330eaf608de6a66e667 100644 (file)
--- a/Documentation/RelNotes/2.43.0.txt
+++ b/Documentation/RelNotes/2.43.0.txt
@@ -193,6 +193,11 @@ Fixes since v2.42
    run via the httpd, unlike ASan options, which has been corrected.
    (merge 252d693797 jk/test-pass-ubsan-options-to-http-test later to maint).
 
+ * "checkout --merge -- path" and "update-index --unresolve path" did
+   not resurrect conflicted state that was resolved to remove path,
+   but now they do.
+   (merge 5bdedac3c7 jc/unresolve-removal later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge fd3ba590d8 ws/git-push-doc-grammofix later to maint).
    (merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint).