summaryrefslogtreecommitdiff
path: root/vcs-svn/fast_export.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-02-05 14:03:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-05 14:03:01 -0800
commit3c864743a68a81b5a15bbd92afcea74470c1bc2f (patch)
treec36b51250e9ca8a6d55a77a10d297a8090477a91 /vcs-svn/fast_export.c
parentMerge branch 'nd/add-empty-fix' into maint (diff)
parentRemove the line length limit for graft files (diff)
downloadtgif-3c864743a68a81b5a15bbd92afcea74470c1bc2f.tar.xz
Merge branch 'js/lift-parent-count-limit' into maint
There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. * js/lift-parent-count-limit: Remove the line length limit for graft files
Diffstat (limited to 'vcs-svn/fast_export.c')
0 files changed, 0 insertions, 0 deletions