From: Junio C Hamano <junkio@cox.net>
Date: Tue, 4 Apr 2006 07:21:50 +0000 (-0700)
Subject: Merge early part of 'jc/combine' branch
X-Git-Tag: v1.3.0-rc4~46
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b411fda15df4897a1308bbb5950088ea6138cbad;p=git.git

Merge early part of 'jc/combine' branch
---

b411fda15df4897a1308bbb5950088ea6138cbad