![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:25 +0000 (00:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Apr 2009 07:46:25 +0000 (00:46 -0700) |
* 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-merge.c | patch | | diff1 | | diff2 | | blob | history |
| grep.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-merge.c
Simple merge
diff --cc grep.c
Simple merge