]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a1a7811) | patch
merge-ort: provide a merge_get_conflicted_files() helper function
authorElijah Newren <newren@gmail.com>
Sat, 18 Jun 2022 00:20:50 +0000 (00:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2022 23:10:06 +0000 (16:10 -0700)
commitfae26ce79cad6d290e296e40f2d46eb783e91110
treebf5e449ec20ff735b92c615c81d5fc30145529c3tree | snapshot
parenta1a7811975e4e3d872379ab03acab9506933de9ccommit | diff
merge-ort: provide a merge_get_conflicted_files() helper function

After a merge, this function allows the user to extract the same
information that would be printed by `ls-files -u`, which means
files with their mode, oid, and stage.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c diff | blob | blame | history
merge-ort.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.