Merge branch 'maint'

Junio C Hamano committed over 15 years ago

mergetool--lib: Add Beyond Compare 3 as a tool

Sebastian Schuberth committed over 15 years ago

mergetool--lib: Sort tools alphabetically for easier lookup

Sebastian Schuberth committed over 15 years ago

branch_merged: fix grammar in warning

Eric Hanchrow committed over 15 years ago

Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-fe

Jonathan Nieder committed over 15 years ago

vcs-svn: teach line_buffer about temporary files

Jonathan Nieder committed almost 16 years ago

vcs-svn: allow input from file descriptor

Jonathan Nieder committed almost 16 years ago

vcs-svn: allow character-oriented input

Jonathan Nieder committed almost 16 years ago

vcs-svn: add binary-safe read function

Jonathan Nieder committed almost 16 years ago

t0081 (line-buffer): add buffering tests

Jonathan Nieder committed almost 16 years ago

vcs-svn: tweak test-line-buffer to not assume line-oriented input

Jonathan Nieder committed almost 16 years ago

tests: give vcs-svn/line_buffer its own test script

Jonathan Nieder committed almost 16 years ago

vcs-svn: make test-line-buffer input format more flexible

Jonathan Nieder committed almost 16 years ago

vcs-svn: teach line_buffer to handle multiple input files

Jonathan Nieder committed about 16 years ago

fast-import: add 'ls' command

David Barr committed almost 16 years ago

vcs-svn: collect line_buffer data in a struct

Jonathan Nieder committed about 16 years ago

vcs-svn: replace buffer_read_string memory pool with a strbuf

Jonathan Nieder committed almost 16 years ago

vcs-svn: eliminate global byte_buffer

Jonathan Nieder committed about 16 years ago

strbuf: add strbuf_vaddf

Jeff King committed over 15 years ago

compat: provide a fallback va_copy definition

Jeff King committed over 15 years ago