| commit | 7fa3338870d66dd3946c5c3a0bd09dadb798893d | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 18 Jun 2022 00:20:52 +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 | 040f35db3176e5d9f94c60d2270619734af1dc26 | treesnapshot (tar.gz zip) |
| parent | a4040cfa35d8781df3e994380d1b559be8b22bd2 | commitdiff |
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>
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>
| Documentation/git-merge-tree.txt | diffblobblamehistory | |
| builtin/merge-tree.c | diffblobblamehistory | |
| t/t4301-merge-tree-write-tree.sh | diffblobblamehistory |