unpack-trees: add usage notices around df_conflict_entry
commitf297424a3a02b552865798ac8367cf657ef1df2d
authorElijah Newren <newren@gmail.com>
Mon, 27 Feb 2023 15:28:20 +0000 (27 15:28 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2023 16:29:51 +0000 (27 08:29 -0800)
tree3e8f89037941300e2ef2b8c964df47e33deec71b
parent1ca13dd3ca6e153a2bc5b0b53555996cdd668e93
unpack-trees: add usage notices around df_conflict_entry

Avoid making users believe they need to initialize df_conflict_entry
to something (as happened with other output only fields before) with
a quick comment and a small sanity check.

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