summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-09-22 20:01:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-09-22 20:01:33 -0700
commit4be4680cbb37cd803fa018c736879d936cd45671 (patch)
tree5d5019f257598b719c0b94907b9722a97a92cd12 /builtin-merge.c
parentMerge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix (diff)
parentt4018-diff-funcname: test syntax of builtin xfuncname patterns (diff)
downloadtgif-4be4680cbb37cd803fa018c736879d936cd45671.tar.xz
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
* bc/maint-diff-hunk-header-fix: t4018-diff-funcname: test syntax of builtin xfuncname patterns
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions