| commit | 15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 19 Apr 2007 02:05:57 +0000 (18 19:05 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 19 Apr 2007 02:21:52 +0000 (18 19:21 -0700) | ||
| tree | d00bc5700c9feaedaa59a95b70d05f9999cceb00 | treesnapshot (tar.gz zip) |
| parent | a5e92abde61d59a8612c5b87d0bae681e90f7fdb | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |