From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Aug 2026 16:20:27 +0000 (-0700)
Subject: Merge branch 'jc/add-resolved'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=230296d5603f39f1b2ef9fd3d0eb23e0f7ae88dc;p=thirdparty%2Fgit.git

Merge branch 'jc/add-resolved'

'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
---

230296d5603f39f1b2ef9fd3d0eb23e0f7ae88dc