From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2009 21:53:58 +0000 (-0800)
Subject: Merge branch 'rs/work-around-grep-opt-insanity' into maint
X-Git-Tag: v1.6.5.5~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=957f5db74fcf2a00260c8bdef4bf147b1b990914;p=git.git

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

957f5db74fcf2a00260c8bdef4bf147b1b990914