From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Apr 2010 19:40:45 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7;p=git.git

Merge branch 'maint'

* maint:
  t1010-mktree: Adjust expected result to code and documentation
  combined diff: correctly handle truncated file
  Document new "already-merged" rule for branch -d
---

f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7