summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-04-20 11:36:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-20 11:36:53 -0700
commit66aaa2fc22c8494d9019b241f5d6395a6044a895 (patch)
tree5f06385c19165637ba12948d70bdea68033afcd7 /builtin-merge-recursive.c
parentMerge branch 'jc/maint-rebase-am' into maint (diff)
downloadtgif-66aaa2fc22c8494d9019b241f5d6395a6044a895.tar.xz
GIT 1.5.5.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions