@matheusbsbs / matheus-bagliano / commits / ad7ace714d
Fork 0

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

Junio C Hamano committed Nov 25, 2009 at 11:45 UTC ad7ace714d353ef49045bc37c1363e8fc904792d

No changes.