summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-12 16:47:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-12 16:47:36 (GMT)
commit18f3ce8841b1cf7a3bee8e8da75fd7520060a4c0 (patch)
tree987dec480980f53bf1ddec5ecb4be3d32db6eb6e /builtin/merge.c
parentbb876eb3717b5f6e2f07d5e216e2db8e2d643707 (diff)
parent542aa25d9748c381a27074fb08614d4cb4713984 (diff)
downloadgit-18f3ce8841b1cf7a3bee8e8da75fd7520060a4c0.zip
git-18f3ce8841b1cf7a3bee8e8da75fd7520060a4c0.tar.gz
git-18f3ce8841b1cf7a3bee8e8da75fd7520060a4c0.tar.bz2
Merge branch 'rs/child-process-init'
A small code clean-up. * rs/child-process-init: use CHILD_PROCESS_INIT to initialize automatic variables
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions