Bump version: 1.0.6

Peaker · Jan 7, 2020 · 987261e · 987261e
1 parent 29b0072
commit 987261e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -0,0 +1,7 @@
+# Since 1.0.5
+
+* Allow merging a specific file
+
+* Reduce add/add conflicts with matching prefix/suffix lines
+
+* Add support for `--untabify`
diff --git a/git-mediate.cabal b/git-mediate.cabal
@@ -2,7 +2,7 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                git-mediate
-version:             1.0.5
+version:             1.0.6
 synopsis:            Tool to help resolving git conflicts
 description:         Git conflict resolution has never been easier
                      .
@@ -51,6 +51,7 @@ maintainer:          [email protected]
 category:            Development
 build-type:          Simple
 extra-source-files:  stack.yaml
+                     ChangeLog.md
 cabal-version:       >=1.10
 
 source-repository head