summaryrefslogtreecommitdiff
path: root/t/t6031-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 15:37:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 15:37:04 -0700
commitfde1cc1dc2631080f45ea55ad8e8cc172a9bd4eb (patch)
tree43274be59aee36cd9f0ce84e1a43f402dc8ee03f /t/t6031-merge-recursive.sh
parentMerge branch 'mm/mediawiki-file-attachments' (diff)
parentvcs-svn: allow 64-bit Prop-Content-Length (diff)
downloadtgif-fde1cc1dc2631080f45ea55ad8e8cc172a9bd4eb.tar.xz
Merge branch 'jn/vcs-svn'
vcs-svn updates to clean-up compilation, lift 32-bit limitations, etc. * jn/vcs-svn: vcs-svn: allow 64-bit Prop-Content-Length vcs-svn: suppress a signed/unsigned comparison warning vcs-svn: suppress a signed/unsigned comparison warning vcs-svn: suppress signed/unsigned comparison warnings vcs-svn: use strstr instead of memmem vcs-svn: use constcmp instead of prefixcmp vcs-svn: simplify cleanup in apply_one_window vcs-svn: avoid self-assignment in dummy initialization of pre_off vcs-svn: drop no-op reset methods vcs-svn: suppress -Wtype-limits warning vcs-svn: allow import of > 4GiB files vcs-svn: rename check_overflow and its arguments for clarity
Diffstat (limited to 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions