t6022: Add tests for reversing order of merges when D/F conflicts present

diff --git a/git-rebase.sh b/git-rebase.sh
index 7508463b30e7d1659ac9423a19d195e494600bd3..3335cee70b8ea5510f109da83d8470d3bbabab52 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -566,6 +566,7 @@ fi
 if test -z "$do_merge"
 then
        git format-patch -k --stdout --full-index --ignore-if-in-upstream \
+               --src-prefix=a/ --dst-prefix=b/ \
                --no-renames $root_flag "$revisions" |
        git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" &&
        move_to_original_branch