From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Feb 2024 19:31:50 +0000 (-0800)
Subject: Merge branch 'ad/custom-merge-placeholder-for-symbolic-pathnames'
X-Git-Tag: v2.44.0-rc0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e189a03da8004193e21c8920cafbf4aa7aa3b3b;p=thirdparty%2Fgit.git

Merge branch 'ad/custom-merge-placeholder-for-symbolic-pathnames'

The labels on conflict markers for the common ancestor, our version,
and the other version are available to custom 3-way merge driver
via %S, %X, and %Y placeholders.

* ad/custom-merge-placeholder-for-symbolic-pathnames:
  merge-ll: expose revision names to custom drivers
---

9e189a03da8004193e21c8920cafbf4aa7aa3b3b