merge-recursive: move some struct declarations together
commit967d6be725b10ac1ea39d50770b358166523fe22
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:17 +0000 (5 08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (8 16:02 +0900)
tree873e333c02d60f57eb81ec5fbc32d81e1fce7108
parent043622b2e9fd7b5e4b07404c4896080a602cc139
merge-recursive: move some struct declarations together

These structs are related and reference each other, so move them
together to make it easier for folks to determine what they hold and
what their purpose is.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c