diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | 7fa3338870d66dd3946c5c3a0bd09dadb798893d (patch) | |
| tree | 040f35db3176e5d9f94c60d2270619734af1dc26 /gitweb/gitweb.css | |
| parent | merge-ort: remove command-line-centric submodule message from merge-ort (diff) | |
| download | git-7fa3338870d66dd3946c5c3a0bd09dadb798893d.tar.gz git-7fa3338870d66dd3946c5c3a0bd09dadb798893d.zip | |
merge-tree: provide a list of which files have conflicts
Callers of `git merge-tree --write-tree` will often want to know which
files had conflicts. While they could potentially attempt to parse the
CONFLICT notices printed, those messages are not meant to be machine
readable. Provide a simpler mechanism of just printing the files (in
the same format as `git ls-files` with quoting, but restricted to
unmerged files) in the output before the free-form messages.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb/gitweb.css')
0 files changed, 0 insertions, 0 deletions