From f34c0b1319b9f0464a27908685b157820128db9f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 29 Dec 2015 17:47:57 -0400
Subject: [PATCH] devblog

---
 doc/devblog/day_352__had_to_be_done.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/devblog/day_352__had_to_be_done.mdwn

diff --git a/doc/devblog/day_352__had_to_be_done.mdwn b/doc/devblog/day_352__had_to_be_done.mdwn
new file mode 100644
index 0000000000..181fbd7e79
--- /dev/null
+++ b/doc/devblog/day_352__had_to_be_done.mdwn
@@ -0,0 +1,3 @@
+Automatic merge conflict resolver updated to work with unlocked files in v6
+repos. Fairly tricky and painful; thank goodness the test suite tests a lot
+of edge cases in that code.