diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-25 11:45:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-25 11:45:07 -0800 |
| commit | ad7ace714d353ef49045bc37c1363e8fc904792d (patch) | |
| tree | 7cefc4953bac3061de09d5380719f12c6e4fcef3 /contrib | |
| parent | b073b7a990deb1cb3425db45642fa18c8b3cb65c (diff) | |
| parent | e1622bfcbad680225ad5c337e4778df88389227e (diff) | |
| download | git-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.gz | |
Merge branch 'rs/work-around-grep-opt-insanity'
* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
Conflicts:
git-instaweb.sh
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions