Bump version: 1.0.9

Not yet uploaded to Hackage, will contact Eyal :)
Peaker · Jul 25, 2023 · 30dc9c8 · 30dc9c8
1 parent 3f000c3
commit 30dc9c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,11 +1,12 @@
-## Changes since last release
+## 1.0.9 / To be released
 
 * Do not warn when git is set to use `zdiff3` conflict style
 * Resolve line ending conventions changes (i.e changes from Unix/Windows line endings)
 * Preserve file modes when resolving conflicts (i.e executable scripts remain executable)
 * Handle changes in `git status` formatting for files in spaces in their names
 * `--context` option for `-d` mode to control size of context shown around diff
 * Fixed parsing of conflicts with nested recursive conflicts
+* `--editor` goes to the location of the first conflict in the file
 
 ## 1.0.8.1 / 2020.10.13
 

diff --git a/git-mediate.cabal b/git-mediate.cabal
@@ -2,7 +2,7 @@
 -- further documentation, see https://cabal.readthedocs.io/
 
 name:                git-mediate
-version:             1.0.8.1
+version:             1.0.9
 synopsis:            Tool to help resolving git conflicts
 description:         Git conflict resolution has never been easier
                      .