merge: make merge.renormalize work for all uses of merge machinery

[git] / t / chainlint / cuddled-if-then-else.expect

(
if test -z ""; then
    echo empty
 else
    echo bizzy
> fi) &&
echo foobar