diff options
author | Elijah Newren <newren@gmail.com> | 2019-08-17 18:41:37 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 17:08:04 (GMT) |
commit | 7c0a6c8e477bd9009001590f49274e892e92fce8 (patch) | |
tree | 833598f74abcf6a5e383db0449620eaf7cdf01c1 /json-writer.c | |
parent | c749ab1da812cdb1263f868c63fe1808a12dcff2 (diff) | |
download | git-7c0a6c8e477bd9009001590f49274e892e92fce8.zip git-7c0a6c8e477bd9009001590f49274e892e92fce8.tar.gz git-7c0a6c8e477bd9009001590f49274e892e92fce8.tar.bz2 |
merge-recursive: move some definitions around to clean up the header
No substantive code changes (view this with diff --color-moved), but
a few small code cleanups:
* Move structs and an inline function only used by merge-recursive.c
into merge-recursive.c
* Re-order function declarations to be more logical
* Add or fix some explanatory comments
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'json-writer.c')
0 files changed, 0 insertions, 0 deletions