diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-03-12 07:40:47 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-03-12 07:40:47 +0300 |
commit | b81a7b58875e07d7e82aafced1de9834ba1ef94a (patch) | |
tree | 47a7e33fdbd718fce1948183e1905a174c43fa40 /builtin-merge-recursive.c | |
parent | 5d921e2931e5041884d8f86fdccc9004a7b071cc (diff) | |
parent | ea14e6c55427f50f78fe47187cd4edb9845943a1 (diff) |
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
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions