summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-27 13:14:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-27 13:14:38 -0700
commit77bd3ea9f54f1584147b594abc04c26ca516d987 (patch)
tree0ccf888f68194e3b3c1b8a017ca42a5e1ec1d212 /merge-recursive.c
parentSync with 2.4.2 (diff)
parentt7063: hide stderr from setup inside prereq (diff)
downloadtgif-77bd3ea9f54f1584147b594abc04c26ca516d987.tar.xz
Merge branch 'nd/untracked-cache'
* nd/untracked-cache: t7063: hide stderr from setup inside prereq
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions