Re: [PATCH] Clarify text filter merge conflict reduction docs

Eyvind Bernhardsen [off-list ref] writes:

quoted

+	if (!core_ll_merge_double_convert)
+		return sha_eq(o_sha, a_sha);

I would rather do this:

	if (sha_eq(o_sha, a_sha))
		return 1;
	if (!core_ll_merge_double_convert)
		return 0;

You are absolutely right.  This part of my patch was an unnecessary
pessimization.

Will fix.