Code

Merge branch 'tr/maint-word-diff-incomplete-line'