Isn't the usual solution to institute a one-sentence-per-line policy? The big win is, indeed, that this allows easy patching/merging/...