Rob Rix 443df7da7c Merge branch 'unbiased-branch-diff-tests-that-actually-test-branch-diff-bias' into unbiased-branch-diffs ... # Conflicts: # src/Diffing.hs # test/CorpusSpec.hs # tools/semantic-git-diff/test/corpus/diff-summaries.json		2016-08-12 13:04:33 -04:00
..
Spec.hs	Merge branch 'unbiased-branch-diff-tests-that-actually-test-branch-diff-bias' into unbiased-branch-diffs	2016-08-12 13:04:33 -04:00