Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Counto-fix in merge-recursive
author
Junio C Hamano
<junkio@cox.net>
Thu, 19 Apr 2007 02:05:57 +0000
(19:05 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 19 Apr 2007 02:21:52 +0000
(19:21 -0700)
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>
raw
|
patch
| inline |
side by side
(from:
15ba3af
)
No differences found