diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | 7c48b27822b280222be1df7ec9f9e98d688f933b (patch) | |
| tree | 0d2a9f250d1d1a0671bec02ed630bef9877e940e /commit-graph.c | |
| parent | merge-ort: optionally produce machine-readable output (diff) | |
| download | git-7c48b27822b280222be1df7ec9f9e98d688f933b.tar.gz git-7c48b27822b280222be1df7ec9f9e98d688f933b.zip | |
merge-tree: allow `ls-files -u` style info to be NUL terminated
Much as `git ls-files` has a -z option, let's add one to merge-tree so
that the conflict-info section can be NUL terminated (and avoid quoting
of unusual filenames).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions