Merge branch 'ab/diff-write-incomplete-line'