Merge pull request #1229 from arrbee/fix-diff-patch-line-numbers Fix diff patch line number calculation