diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | fae26ce79cad6d290e296e40f2d46eb783e91110 (patch) | |
| tree | bf5e449ec20ff735b92c615c81d5fc30145529c3 /gitweb | |
| parent | merge-tree: support including merge messages in output (diff) | |
| download | git-fae26ce79cad6d290e296e40f2d46eb783e91110.tar.gz git-fae26ce79cad6d290e296e40f2d46eb783e91110.zip | |
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>
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions