summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-30 20:05:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-30 20:05:38 -0700
commit0f06f3ff76bea09a2344adacca5bfc0d637b2086 (patch)
treef3492b6b08cb5b96150dc5d9dd2ab3752707721c /merge-recursive.h
parentMerge branch 'maint' (diff)
parentmodernize fetch/merge/pull examples (diff)
downloadtgif-0f06f3ff76bea09a2344adacca5bfc0d637b2086.tar.xz
Merge branch 'cb/doc-fetch-pull-merge'
* cb/doc-fetch-pull-merge: modernize fetch/merge/pull examples
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions