Merge branch 'maint'

* maint:
git-svn: fix find-rev error message when missing arg
t0021: tr portability fix for Solaris
launch_editor(): allow spaces in the filename
git rebase --abort: always restore the right commit

diff --cc builtin-tag.c
Simple merge

diff --cc git-svn.perl
Simple merge