| commit | fae26ce79cad6d290e296e40f2d46eb783e91110 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 18 Jun 2022 00:20:50 +0000 (18 00:20 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Jun 2022 23:10:06 +0000 (22 16:10 -0700) | ||
| tree | bf5e449ec20ff735b92c615c81d5fc30145529c3 | treesnapshot (tar.gz zip) |
| parent | a1a7811975e4e3d872379ab03acab9506933de9c | commitdiff |
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>
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 | diffblobblamehistory | |
| merge-ort.h | diffblobblamehistory |