Junio C Hamano ad7ace714d 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

2009-11-25 11:45:07 -08:00

17 KiB

Executable File

Raw Blame History

View Raw