diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-28 00:46:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-28 00:46:20 -0700 |
| commit | 3e73cb2f48cc4044905455a9936692f967a0f9b3 (patch) | |
| tree | 9b4030b25e8b69e40f5de0ec00dd1ba2465a2f44 /t/t6023-merge-file.sh | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | grep: fix segfault when "git grep '('" is given (diff) | |
| download | tgif-3e73cb2f48cc4044905455a9936692f967a0f9b3.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
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
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions