summaryrefslogtreecommitdiff
path: root/server-info.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-02-19 21:18:17 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-19 21:18:17 -0800
commit73be17f0b387b2741646498a9a80da677a9e0c7a (patch)
treee5d845a0d0da8926a8370987b44ebb34f690c6f0 /server-info.c
parentMerge branch 'jc/mv' (diff)
parentfmt-merge-msg: do not add excess newline at the end. (diff)
downloadtgif-73be17f0b387b2741646498a9a80da677a9e0c7a.tar.xz
Merge branch 'jc/merge-msg'
* jc/merge-msg: fmt-merge-msg: do not add excess newline at the end. fmt-merge-msg: say which branch things were merged into unless 'master'
Diffstat (limited to 'server-info.c')
0 files changed, 0 insertions, 0 deletions