git-mediate 1.0.7 → 1.0.8
raw patch · 3 files changed
+7/−2 lines, 3 files
Files
- ChangeLog.md +4/−0
- git-mediate.cabal +1/−1
- stack.yaml +2/−1
ChangeLog.md view
@@ -1,3 +1,7 @@+# Since 1.0.7++* Fix stack.yaml to use Diff 0.4 as well+ # Since 1.0.6 * Upgrade Diff dependency to 0.4
git-mediate.cabal view
@@ -2,7 +2,7 @@ -- further documentation, see http://haskell.org/cabal/users-guide/ name: git-mediate-version: 1.0.7+version: 1.0.8 synopsis: Tool to help resolving git conflicts description: Git conflict resolution has never been easier .
stack.yaml view
@@ -1,5 +1,6 @@ flags: {} packages: - '.'-extra-deps: []+extra-deps:+- Diff-0.4.0 resolver: lts-14.6