Merge branch 'es/rebase-i-no-abbrev' into maint
* es/rebase-i-no-abbrev: rebase -i: fix short SHA-1 collision t3404: rebase -i: demonstrate short SHA-1 collision t3404: make tests more self-contained Conflicts: t/t3404-rebase-interactive.sh
Junio C Hamano committed
Oct 17, 2013 at 15:45 UTC
f8a3fd28fd9e61852f5944335e7338c52c8c5abd
No changes.