Subject: [PATCH v10 1/2] fixup! merge-recursive: fix was_tracked() to quit lying with some renamed paths

From: Elijah Newren <[email-masked]>
Date: Tue, 24 Apr 2018 13:20:59 -0700

---
 merge-recursive.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 1de8dc1c53..f2cbad4f10 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3146,10 +3146,10 @@ int merge_trees(struct merge_options *o,
 
 	/* Free the extra index left from git_merge_trees() */
 	/*
-	 * FIXME: Need to also data allocated by setup_unpack_trees_porcelain()
-	 * tucked away in o->unpack_opts.msgs, but the problem is that only
-	 * half of it refers to dynamically allocated data, while the other
-	 * half points at static strings.
+	 * FIXME: Need to also free data allocated by
+	 * setup_unpack_trees_porcelain() tucked away in o->unpack_opts.msgs,
+	 * but the problem is that only half of it refers to dynamically
+	 * allocated data, while the other half points at static strings.
 	 */
 	discard_index(&o->orig_index);
 
-- 
2.17.0.295.g791b7256b2.dirty