diff --git a/CHANGELOG.md b/CHANGELOG.md index f7f03b7..23453ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## Unreleased + +## [2.2.1] - 2021-11-26 ### Fixed - Use `FugitiveShellCommand` instead of `repo.git_command` (which is deprecated by Fugitive) - Use `Git merge` instead of `Gmerge` (which is deprecated by Fugitive) diff --git a/doc/merginal.txt b/doc/merginal.txt index 2da9396..9ba215b 100644 --- a/doc/merginal.txt +++ b/doc/merginal.txt @@ -4,7 +4,7 @@ Author: Idan Arye License: Same terms as Vim itself (see |license|) -Version: 2.2.0+ +Version: 2.2.1 INTRODUCTION *merginal*