From 354014ef264b9b362bd0eff2dc16aca1f3c20885 Mon Sep 17 00:00:00 2001
From: Yair Chuchem <yairchu@gmail.com>
Date: Fri, 20 Sep 2024 13:49:27 +0300
Subject: [PATCH] Bump version to 1.1.0 and update changelog

---
 .gitignore        | 1 +
 ChangeLog.md      | 9 +++++++++
 git-mediate.cabal | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e4a7d48..c7ab29b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ tags
 .ghcid
 .vscode/
 .envrc
+.DS_Store
diff --git a/ChangeLog.md b/ChangeLog.md
index 6fe4cc3..b67b077 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,12 @@
+## 1.1.0 / 2024.09.20
+
+* `--split-markers` option to help users split large conflicts to smaller parts
+* `--lines-added-around` option to auto-resolve conflicts of line added from different sides
+* Command-line options are are also parsed from the `GIT_MEDIATE_OPTIONS` environment variables
+* Can disable auto-resolution with the `--no-trivial`, `--no-reduce`, and `--no-line-endings` flags
+* Improved `--editor` support for VS Code and Xcode
+* Fixed handling of filenames containing spaces and special characters
+
 ## 1.0.9 / 2023.07.25
 
 * Do not warn when git is set to use `zdiff3` conflict style
diff --git a/git-mediate.cabal b/git-mediate.cabal
index aca59e7..6e04767 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.9
+version:             1.1.0
 synopsis:            Tool to help resolving git conflicts
 description:         Git conflict resolution has never been easier
                      .