aboutsummaryrefslogtreecommitdiff
path: root/server-info.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-30 00:03:52 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-30 00:03:52 -0700
commitbcb477fb60dc3e7c75a0c2870b106afeb21ae5d2 (patch)
treef766e0c08f08560d53336a2ee8fa469d9f877c70 /server-info.c
parent144dfc5c63dfe829aafdb2cba3bd549600b6008b (diff)
parent7a45c313964e293f45384ca0a2ae1d326c83a061 (diff)
downloadgit-bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2.tar.gz
git-bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2.tar.xz
Merge branch 'bc/maint-api-doc-parked' into maint
* bc/maint-api-doc-parked: Documentation/technical/api-diff.txt: correct name of diff_unmerge()
Diffstat (limited to 'server-info.c')
0 files changed, 0 insertions, 0 deletions