Rob Rix 62196878fa Merge branch 'master' into ghc8 ...

# Conflicts:
#	semantic-diff.cabal
#	src/Diff.hs
#	src/Term.hs
#	src/Term/Arbitrary.hs
#	stack.yaml
#	tools/semantic-git-diff/src/SemanticDiff.hs

2016-09-14 16:12:47 -04:00

17 KiB

Raw History

View Raw