diff options
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 99e375902..3ca9bc6ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -229,6 +229,9 @@ support for HTTPS connections insead of OpenSSL. index. Specifically, time and file size are 32 bits intead of 64, as these values are truncated. +* `GIT_EMERGECONFLICT` is now `GIT_ECONFLICT`, which more accurately + describes the nature of the error. + v0.22 ------ |