The fourteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 2, 2023 at 11:19 UTC
d0e8084c65cbf949038ae4cc344ac2c2efd77415
1 file changed
+5
Documentation/RelNotes/2.43.0.txt
+5
@@ -193,6 +193,11 @@ Fixes since v2.42
193
run via the httpd, unlike ASan options, which has been corrected.
194
(merge 252d693797 jk/test-pass-ubsan-options-to-http-test later to maint).
195
196
+ * "checkout --merge -- path" and "update-index --unresolve path" did
197
+ not resurrect conflicted state that was resolved to remove path,
198
+ but now they do.
199
+ (merge 5bdedac3c7 jc/unresolve-removal later to maint).
200
+
201
* Other code cleanup, docfix, build fix, etc.
202
(merge fd3ba590d8 ws/git-push-doc-grammofix later to maint).
203
(merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint).