diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2009-11-18 17:15:19 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-07 11:05:18 -0800 |
| commit | 5565f47c4054e9a1abfad8c4a754e9a6224dc591 (patch) | |
| tree | d3f70dee65edfdc77e947bb63b9502848e7cb44c /git-merge-one-file.sh | |
| parent | stash: suggest the correct command line for unknown options. (diff) | |
| download | tgif-5565f47c4054e9a1abfad8c4a754e9a6224dc591.tar.xz | |
unset GREP_OPTIONS in test-lib.sh
I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this
the test t4252-am-options.sh fails because it calls grep with a .rej file:
grep "@@ -1,3 +1,3 @@" file-2.rej
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions