summaryrefslogtreecommitdiff
path: root/compat/nedmalloc/License.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-06-13 12:50:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-13 12:50:22 -0700
commit0a17b2cd7ebc0beeab6121d96ce812f22994cc39 (patch)
tree85dd8e39916a822c2ce5ee98e284a19a9a632297 /compat/nedmalloc/License.txt
parentMerge branch 'ph/submodule-rebase' (early part) (diff)
parentrefuse to merge during a merge (diff)
downloadtgif-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.tar.xz
Merge branch 'cb/maint-no-double-merge'
* cb/maint-no-double-merge: refuse to merge during a merge
Diffstat (limited to 'compat/nedmalloc/License.txt')
0 files changed, 0 insertions, 0 deletions