summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-13 19:50:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-13 19:50:22 (GMT)
commit0a17b2cd7ebc0beeab6121d96ce812f22994cc39 (patch)
tree85dd8e39916a822c2ce5ee98e284a19a9a632297 /http-push.c
parent7d40f89137b456820d51ebc1cbb3ffbb966e7fec (diff)
parentc8c562a238071843c64ea0f3a2c85481606da379 (diff)
downloadgit-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.zip
git-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.tar.gz
git-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.tar.bz2
Merge branch 'cb/maint-no-double-merge'
* cb/maint-no-double-merge: refuse to merge during a merge
Diffstat (limited to 'http-push.c')
0 files changed, 0 insertions, 0 deletions