aboutsummaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:25 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-22 11:27:25 -0800
commit52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d (patch)
treef9e75a67727f79915c7c1170914bd22ac4ee247f /notes-merge.h
parentc53d1e49f9b87cbfb7e53b17cd935e8c54469d6b (diff)
parent781f76b15824bb929b6f3f007d8e43894e4980cd (diff)
downloadgit-52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d.tar.gz
git-52b9d2cf7fbde061bf0d3336e3a89d7333d5b23d.tar.xz
Merge branch 'jk/maint-do-not-feed-stdin-to-tests'
* jk/maint-do-not-feed-stdin-to-tests: test-lib: redirect stdin of tests
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions