Files
git/Documentation
Elijah Newren 7fa3338870 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>
2022-06-22 16:10:06 -07:00
..
2022-06-17 17:15:13 -07:00
2022-06-10 15:04:15 -07:00
2020-08-04 18:34:02 -07:00
2022-04-11 16:44:45 -07:00
2021-09-28 10:31:02 -07:00
2022-06-21 08:58:04 -07:00
2022-02-02 14:50:09 -08:00
2021-09-28 10:31:02 -07:00
2021-12-10 14:35:03 -08:00
2022-03-31 15:57:10 -07:00
2022-01-07 15:19:34 -08:00
2019-05-07 13:04:48 +09:00
2022-06-03 14:30:37 -07:00
2019-10-21 12:02:39 +09:00