Reverted [53f96d9a97] since this commit was not correct.
A logical line is merged with its previous line if and only if the eol of the previous line is elided ([53f96d9a97] was not fully correct).