[kannonboy]

One of the Bitbucket engineers put a one-liner in the comments on the post that will generate diff-like output similar to what you're describing: https://developer.atlassian.com/blog/2015/01/a-better-pull-r...

[mindprince]

Yup, that was me who asked the question there. :-)