summaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-10 21:47:01 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-10 21:47:01 -0800
commit8bb2b516d56722776255faaccc0b1d63e444a93e (patch)
tree37d7bfcf32e63e27905db808b23bd25b8d03286a /merge-base.c
parentDocumentation: s/seperator/separator/ (diff)
parentuser-manual: install user manual stylesheet with other web documents (diff)
downloadtgif-8bb2b516d56722776255faaccc0b1d63e444a93e.tar.xz
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* 'maint' of git://linux-nfs.org/~bfields/git: user-manual: install user manual stylesheet with other web documents user-manual: fix rendering of history diagrams user-manual: fix missing colon in git-show example user-manual: fix inconsistent use of pull and merge user-manual: fix inconsistent example glossary: fix overoptimistic automatic linking of defined terms
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions