summaryrefslogtreecommitdiff
path: root/branch.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-19 20:37:19 -0700
commit5c359a66586cfa802f9a4b205da9750582bdb9ec (patch)
treee6d48fc77677ca982e6bcfe085ea2a9a8360c711 /branch.h
parentMerge branch 'jk/cherry-pick-root-with-resolve' (diff)
parentMerge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma... (diff)
downloadtgif-5c359a66586cfa802f9a4b205da9750582bdb9ec.tar.xz
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'
* js/maint-send-pack-stateless-rpc-deadlock-fix: sideband_demux(): fix decl-after-stmt
Diffstat (limited to 'branch.h')
0 files changed, 0 insertions, 0 deletions