From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2009 07:46:25 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint
X-Git-Tag: v1.6.3-rc4~6^2~1
X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=2254da06a5473ffde973337bad2c6a96eea61e20

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  grep: fix segfault when "git grep '('" is given
  Documentation: fix a grammatical error in api-builtin.txt
  builtin-merge: fix a typo in an error message
---

2254da06a5473ffde973337bad2c6a96eea61e20