Fix bug in the output of StructuredStrategy.
Fix bug in the output of StructuredStrategy.

If the last line of a merged file was the end of a conflict,
this conflict was missed. This commit handles this situation.

Signed-off-by: Olaf Lessenich <09dc7d5025e152d90232b58d4c490220fe4b9097@fim.uni-passau.de>

shuiblue/JDimeForCpp,shuiblue/JDimeForCpp,shuiblue/JDimeForCpp