From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Nov 2009 19:45:07 +0000 (-0800)
Subject: Merge branch 'rs/work-around-grep-opt-insanity'
X-Git-Tag: v1.6.6-rc1~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad7ace714d353ef49045bc37c1363e8fc904792d?hp=ad7ace714d353ef49045bc37c1363e8fc904792d

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
---