summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-29 13:18:56 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-29 13:18:56 -0800
commit5a304dd303cd47d8b05b17766399010a674e799a (patch)
treed86367b58b7367bb488205157b87e003fb0fc1cd /fmt-merge-msg.h
parentMerge branch 'rs/diff-postimage-in-context' (diff)
parentindex-pack: eliminate unlimited recursion in get_base_data() (diff)
downloadtgif-5a304dd303cd47d8b05b17766399010a674e799a.tar.xz
Merge branch 'nd/index-pack-no-recurse'
* nd/index-pack-no-recurse: index-pack: eliminate unlimited recursion in get_base_data() index-pack: eliminate recursion in find_unresolved_deltas Eliminate recursion in setting/clearing marks in commit list
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions