tree 74f2d92d9560adb88aa065c1003522e4a39388bb
parent 59b8d38f6e4f19b93c5dc4493ab11706acd101b5
parent 493b7a08d80535def6756b281873e4e0937ba6c2
author Junio C Hamano <gitster@pobox.com> 1252830260 -0700
committer Junio C Hamano <gitster@pobox.com> 1252830260 -0700

Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint

* cb/maint-1.6.3-grep-relative-up:
  grep: accept relative paths outside current working directory
  grep: fix exit status if external_grep() punts

Conflicts:
	t/t7002-grep.sh