From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Oct 2023 18:20:00 +0000 (-0700)
Subject: Merge branch 'jc/unresolve-removal'
X-Git-Tag: v2.43.0-rc0~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bb67fb7ab035ef399d019440f184aee3608f3e7;p=thirdparty%2Fgit.git

Merge branch 'jc/unresolve-removal'

"checkout --merge -- path" and "update-index --unresolve path" did
not resurrect conflicted state that was resolved to remove path,
but now they do.

* jc/unresolve-removal:
  checkout: allow "checkout -m path" to unmerge removed paths
  checkout/restore: add basic tests for --merge
  checkout/restore: refuse unmerging paths unless checking out of the index
  update-index: remove stale fallback code for "--unresolve"
  update-index: use unmerge_index_entry() to support removal
  resolve-undo: allow resurrecting conflicted state that resolved to deletion
  update-index: do not read HEAD and MERGE_HEAD unconditionally
---

5bb67fb7ab035ef399d019440f184aee3608f3e7