aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-17 14:48:44 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-17 15:19:11 -0800
commitad36dc8b4b165bf9eb3576b42a241164e312d48c (patch)
treead06a77c844046f3c06b20e7d6e0f51aa4759260 /merge-recursive.c
parent647a1bcf14bd523dcca6b0be6f51f03e6863a02d (diff)
downloadgit-ad36dc8b4b165bf9eb3576b42a241164e312d48c.tar.gz
git-ad36dc8b4b165bf9eb3576b42a241164e312d48c.tar.xz
Almost ready for 2.11.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions