diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 22:55:09 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 22:55:09 +0400 |
| commit | 445d2c51a4b6883d6a7b14228d5de0bb22a09d8e (patch) | |
| tree | 832cd35c548026a9500e075f994902b683b2fb20 /git-mergetool--lib.sh | |
| parent | 2df9988470d8f1ad82a642eb6d5b2ddde1512bc0 (diff) | |
| parent | 84befcd0a4a074e2ae191c32be09d2e82d5db114 (diff) | |
Merge branch 'js/grep-patterntype-config'
"grep" learned to use a non-standard pattern type by default if a
configuration variable tells it to.
* js/grep-patterntype-config:
grep: add a grep.patternType configuration setting
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions