diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-19 02:05:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-19 02:21:52 (GMT) |
| commit | 15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16 (patch) | |
| tree | d00bc5700c9feaedaa59a95b70d05f9999cceb00 /diffcore-pickaxe.c | |
| parent | a5e92abde61d59a8612c5b87d0bae681e90f7fdb (diff) | |
| download | git-15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16.zip git-15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16.tar.gz git-15ba3af2d5056313fa19ceb0cb7f7cb3cdd54f16.tar.bz2 | |
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>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions