summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-04-19 21:11:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-19 21:11:29 -0700
commit3642617ee7359eed5e108fea48981841591142bf (patch)
tree79cc1c5fab5efa38ddd4a1fdfbb9e02f16d4ed78 /ll-merge.h
parentMerge branch 'jc/terminator-separator' (diff)
parentbuiltin-status: Add tests for submodule summary (diff)
downloadtgif-3642617ee7359eed5e108fea48981841591142bf.tar.xz
Merge branch 'py/submodule'
* py/submodule: builtin-status: Add tests for submodule summary builtin-status: submodule summary support git-submodule summary: --for-status option
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions