Merge branch 'sg/test-rebase-editor-fix'

* sg/test-rebase-editor-fix:
t3404-rebase-interactive: test abbreviated commands

diff --cc t/lib-rebase.sh
index f6c45ee08f6e348bc7af2939d2bfa65f5c057ae0,0c93d00bddaad8a7cb6ea7ab6b966ff0c0e89fb1..7ea30e50068be8f892a289c8bf705d8096a27ec3
--- 1/t/lib-rebase.sh
--- 2/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@@ -47,9 -47,9 +47,9 @@@ set_fake_editor () 
        action=pick
        for line in $FAKE_LINES; do
                case $line in
-               pick|squash|fixup|edit|reword|drop)
+               pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d)
                        action="$line";;
-               exec*|break|b)
 -              exec_*|x_*)
++              exec_*|x_*|break|b)
                        echo "$line" | sed 's/_/ /g' >> "$1";;
                "#")
                        echo '# comment' >> "$1";;

diff --cc t/t3404-rebase-interactive.sh
Simple merge