summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-04-11 13:54:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-11 13:54:28 -0700
commit4553d58f374c6bfcae6b4be528bbf11c18a7efe5 (patch)
tree44877f9283ffa304e6a805a56f2270fe21b892c7 /ll-merge.h
parentSync with 1.7.0.5 (diff)
parentWindows: start_command: Support non-NULL dir in struct child_process (diff)
downloadtgif-4553d58f374c6bfcae6b4be528bbf11c18a7efe5.tar.xz
Merge branch 'jl/maint-submodule-gitfile-awareness'
* jl/maint-submodule-gitfile-awareness: Windows: start_command: Support non-NULL dir in struct child_process
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions