summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-28 11:13:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-28 11:13:07 -0800
commit6d7c1c88940320c2ccde9d996181826a38ff7a81 (patch)
tree9773353087b0423a17a0202fdd9e1f496fb6b8b7 /builtin/merge-base.c
parentMerge branch 'ds/completion-silence-in-tree-path-probe' into maint (diff)
parentattr: make it build with DEBUG_ATTR again (diff)
downloadtgif-6d7c1c88940320c2ccde9d996181826a38ff7a81.tar.xz
Merge branch 'nd/attr-debug-fix' into maint
* nd/attr-debug-fix: attr: make it build with DEBUG_ATTR again
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions