summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-26 00:29:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-26 00:29:05 -0700
commiteed1fcd76d8893ab687c700e1729faea025ba7a8 (patch)
treef21a08093d584cf316b77c0a646a505ba1431a2d /builtin-merge.c
parentMerge branch 'db/push-cleanup' (diff)
parentdocumentation: update cvsimport description of "-r" for recent clone (diff)
downloadtgif-eed1fcd76d8893ab687c700e1729faea025ba7a8.tar.xz
Merge branch 'maint'
* maint: documentation: update cvsimport description of "-r" for recent clone
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions