Merge pull request #3299 from ethomson/xdiff_update Don't add unnecessary trailing newline during file merge
2015-07-08T21:17:56