aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-14 10:49:41 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-14 10:49:41 -0700
commit7543dea8b2a33e4a56b0fdd408bc47769238025e (patch)
tree5e52a1917c020412eb7e751bd92a1f6412081a51 /merge-recursive.c
parentcc7b2f8281a7a4ec3de97a991528686c96703431 (diff)
parentb9a1907899a2a00e94092207bb5de4d864408806 (diff)
downloadgit-7543dea8b2a33e4a56b0fdd408bc47769238025e.tar.gz
git-7543dea8b2a33e4a56b0fdd408bc47769238025e.tar.xz
Merge branch 'sk/tag-contains-wo-recursion'
* sk/tag-contains-wo-recursion: t7004: give the test a bit more stack space
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions