diff options
| author | Elijah Newren <newren@gmail.com> | 2022-10-23 04:28:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-23 08:21:24 +0300 |
| commit | a9f5bb83e0341a04c46b2dec27e16c793d6447f8 (patch) | |
| tree | 7bdc3e7bb8a1a66d421735988b67b9a774c3ea8b /builtin/merge-tree.c | |
| parent | 1fc3c0ad407008c2f71dd9ae1241d8b75f8ef886 (diff) | |
merge-tree: update documentation for differences in -z output
The Informational Messages was updated in de90581141 ("merge-ort:
optionally produce machine-readable output", 2022-06-18) to provide more
detailed and machine parseable output when `-z` is passed, but the
Documentation was not updated to reflect these changes. Update it now.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions