From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Apr 2007 02:05:57 +0000 (-0700)
Subject: Counto-fix in merge-recursive
X-Git-Tag: v1.5.2-rc0~18^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16?hp=15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16

Counto-fix in merge-recursive

When the configuration has variables unrelated to low-level
merge drivers (e.g. merge.summary), the code failed to ignore
them but did something totally senseless.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---