From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 28 Mar 2009 07:41:50 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint
X-Git-Tag: v1.6.2.2~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d5156496d2d32800df52fa372295c16ab2578f0;p=git.git

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  test-lib: Clean up comments and Makefile.
  diff --no-index: Do not generate patch output if other output is requested
---

9d5156496d2d32800df52fa372295c16ab2578f0