From 30dc9c86cffd96f4dc35848af62031d08c5eef33 Mon Sep 17 00:00:00 2001 From: Yair Chuchem Date: Tue, 25 Jul 2023 14:11:21 +0300 Subject: [PATCH] Bump version: 1.0.9 Not yet uploaded to Hackage, will contact Eyal :) --- ChangeLog.md | 3 ++- git-mediate.cabal | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 395305d..ddb2069 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,4 +1,4 @@ -## 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) @@ -6,6 +6,7 @@ * 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 index ac730b0..c376f56 100644 --- 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 .