From 987261eb6613cdca5da96ea7ec047d7817830fe2 Mon Sep 17 00:00:00 2001
From: Eyal Lotem <eyal.lotem@gmail.com>
Date: Tue, 7 Jan 2020 10:12:00 +0200
Subject: [PATCH] Bump version: 1.0.6

---
 ChangeLog.md      | 7 +++++++
 git-mediate.cabal | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 ChangeLog.md

diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
index 0000000..076e80f
--- /dev/null
+++ 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
index 381d81c..1a1f763 100644
--- 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:          eyal.lotem@gmail.com
 category:            Development
 build-type:          Simple
 extra-source-files:  stack.yaml
+                     ChangeLog.md
 cabal-version:       >=1.10
 
 source-repository head