Commit ff8d635adbf1208927c7319178d29b0ed973a107

Carlos Martín Nieto 2015-05-28T18:45:57

Merge pull request #3139 from ethomson/diff_conflicts Include conflicts when diffing