summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 12:13:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 12:42:17 -0700
commit8499644ea7af87c02f9b878f162aa6facbd5b8a7 (patch)
tree0ad437bab5900b45a0ec3371d186cf3d06075290 /builtin/merge.c
parentMerge branch 'jk/tag-list-multiple-patterns' into maint (diff)
downloadtgif-8499644ea7af87c02f9b878f162aa6facbd5b8a7.tar.xz
Prepare for 1.7.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions