haskellPackages.diff3: New expression
Merge pull request #1716 from ocharles/haskellPackages.diff3

haskellPackages.diff3: New expression