From: Junio C Hamano <junkio@cox.net>
Date: Thu, 16 Mar 2006 00:15:23 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f2cb4004fd5b3ec4b11ad8ee6a374a55e9292732;p=git.git

Merge branch 'master' into next

* master:
  fix imap-send for OSX
  Let merge set the default strategy.
---

f2cb4004fd5b3ec4b11ad8ee6a374a55e9292732