projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
64ecb62
6169858
)
Merge branch 'master' into next
author
Junio C Hamano
<junkio@cox.net>
Thu, 16 Mar 2006 00:15:23 +0000
(16:15 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 16 Mar 2006 00:15:23 +0000
(16:15 -0800)
* master:
fix imap-send for OSX
Let merge set the default strategy.
Trivial merge