diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:53:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:53:58 -0800 |
| commit | 957f5db74fcf2a00260c8bdef4bf147b1b990914 (patch) | |
| tree | 293baa7d48d5c9428b2ffc232519f875d4cd5770 /test-parse-options.c | |
| parent | af742b9b27c3e3caac9b304c76db323e2334b955 (diff) | |
| parent | e1622bfcbad680225ad5c337e4778df88389227e (diff) | |
| download | git-957f5db74fcf2a00260c8bdef4bf147b1b990914.tar.gz | |
Merge branch 'rs/work-around-grep-opt-insanity' into maint
* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
Diffstat (limited to 'test-parse-options.c')
0 files changed, 0 insertions, 0 deletions