summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-13 13:23:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-13 13:23:24 -0700
commitedec3709db124a96134a64d8fd1117ca50f90f7c (patch)
treeb770ca46e589b1ef939fa83a01e63bebdac841bc /builtin/merge.c
parentMerge branch 'sb/submodule-module-list-pathspec-fix' (diff)
downloadtgif-edec3709db124a96134a64d8fd1117ca50f90f7c.tar.xz
Twelfth batch for 2.9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions