summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-09 14:00:58 +0900
committerJunio C Hamano <gitster@pobox.com>2019-10-09 14:00:58 +0900
commit042a54d2514c70f3a329189b141422d5f9726c13 (patch)
treebce9fbb98d6c2a91e9aec045ed0f8a52c916bfa6 /merge-recursive.c
parentb744c3af07a15aaeb1b82fab689995fd5528f120 (diff)
parentfe0ed5d5e9d726d195758f7ae9b00e61399d8319 (diff)
Merge branch 'am/visual-studio-config-fix'
Dev support. * am/visual-studio-config-fix: contrib/buildsystems: fix Visual Studio Debug configuration
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions