@matheusbsbs / matheus-bagliano / commits / 957f5db74f
Fork 0

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

Junio C Hamano committed Dec 3, 2009 at 13:53 UTC 957f5db74fcf2a00260c8bdef4bf147b1b990914

No changes.