diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:26:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:26:52 -0700 |
| commit | 9fddaf78964a835160a0b27cdac724c27aab09bf (patch) | |
| tree | bc7d01f3fc383385b11f8931beaf2a114eab9620 /git-mergetool--lib.sh | |
| parent | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude (diff) | |
| parent | grep: fix the error message that mentions --exclude (diff) | |
| download | tgif-9fddaf78964a835160a0b27cdac724c27aab09bf.tar.xz | |
Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
* jc/maint-grep-untracked-exclude:
grep: fix the error message that mentions --exclude
Conflicts:
builtin/grep.c
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions