summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Andy Parkins <andyparkins@gmail.com>2007-04-26 22:35:39 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-26 20:58:04 -0700
commit8e404f82abdfd912ad43c6fae7c218ff75a5d122 (patch)
treef00b2fb2a21ec1572fabbdbc25e531821e6c5f03 /merge-tree.c
parentIgnore merged status of the file-level merge (diff)
downloadtgif-8e404f82abdfd912ad43c6fae7c218ff75a5d122.tar.xz
post-receive-email example hook: fastforward should have been fast_forward
Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions