]> Kevux Git Server - rit/commit
projects / rit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35d94b5 81effe9)
Merge branch 'ad/custom-merge-placeholder-for-symbolic-pathnames'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Feb 2024 19:31:50 +0000 (11:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Feb 2024 19:31:50 +0000 (11:31 -0800)
commit9e189a03da8004193e21c8920cafbf4aa7aa3b3b
treee18c1ae0df21b6229c3a883e88e7f2a98700e30dtree | snapshot
parent35d94b55f733814898177fcede4a5081355723e7commit | diff
parent81effe94682dbfed55171468074db85fa661cc21commit | diff
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
Git without Rust.