Merge branch 'jm/dedup-test-config' into maint

* jm/dedup-test-config:
  t/t7810-grep.sh: remove duplicate test_config()
This commit is contained in:
Junio C Hamano 2014-07-22 10:26:45 -07:00
commit 054e22caf4

View File

@ -1096,11 +1096,6 @@ test_expect_success 'grep -E pattern with grep.patternType=fixed' '
test_cmp expected actual
'
test_config() {
git config "$1" "$2" &&
test_when_finished "git config --unset $1"
}
cat >expected <<EOF
hello.c<RED>:<RESET>int main(int argc, const char **argv)
hello.c<RED>-<RESET>{