summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-06 11:44:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-06 11:44:24 -0700
commit72d917a7f9a5123ef7c0d6db306bbc0d385227e2 (patch)
tree76d31e7c650f217010638c797410dde51e6cb2bf /git-merge-resolve.sh
parentMerge branch 'la/tag-force-signing-annotated-tags' (diff)
downloadtgif-72d917a7f9a5123ef7c0d6db306bbc0d385227e2.tar.xz
Second batch for post 2.8 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions