Bump version to 1.1.0 and update changelog

Peaker · Sep 20, 2024 · 354014e · 354014e
1 parent 9b245da
commit 354014e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ tags
 .ghcid
 .vscode/
 .envrc
+.DS_Store
diff --git 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
@@ -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
                      .
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,3 +14,4 @@ tags @@
     .ghcid
     .vscode/
     .envrc
+    .DS_Store