From ad48349741384ed0e49fab9cf13ac7f90aba0dd1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 11 Jan 2021 21:52:32 -0400
Subject: Merge from git-annex.

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index c3b43a4..f38d6b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+git-repair (1.20210111) UNRELEASED; urgency=medium
+
+  * Merge from git-annex.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 11 Jan 2021 21:52:06 -0400
+
 git-repair (1.20200504) unstable; urgency=medium
 
   * Fix a few documentation typos.
-- 
cgit v1.2.3