From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:40:44 +0000 (-0700)
Subject: Merge branch 'jc/add-resolved' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc22d07ad777615cc2b9083a20362ce72c4c0503;p=thirdparty%2Fgit.git

Merge branch 'jc/add-resolved' into jch

'git add' has been taught a new '--resolved' option to stage
conflict-resolved paths, while leaving unrelated local changes
unstaged. It scans the unmerged paths for leftover conflict markers
and aborts if any are found.

* jc/add-resolved:
  add: introduce '--resolved' option
  read-cache: add remove_file_from_index_with_flags()
  merge-ll: consolidate conflict marker scanning logic
  read-cache: reindent
---

fc22d07ad777615cc2b9083a20362ce72c4c0503