| commit | ad7ace714d353ef49045bc37c1363e8fc904792d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Nov 2009 19:45:07 +0000 (25 11:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Nov 2009 19:45:07 +0000 (25 11:45 -0800) | ||
| tree | 7cefc4953bac3061de09d5380719f12c6e4fcef3 | treesnapshot (tar.gz zip) |
| parent | b073b7a990deb1cb3425db45642fa18c8b3cb65c | commitdiff |
| parent | e1622bfcbad680225ad5c337e4778df88389227e | commitdiff |
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
* rs/work-around-grep-opt-insanity:
Protect scripted Porcelains from GREP_OPTIONS insanity
mergetool--lib: simplify guess_merge_tool()
Conflicts:
git-instaweb.sh