Merge branch 'fc/rerere-conflict-style'

diff --git a/t/t9135-git-svn-moved-branch-empty-file.sh b/t/t9135-git-svn-moved-branch-empty-file.sh
index 5280e5f1e405f2a93620b496c64e85e73181f13a..93db45db7d69e460d7005815c19ccc63e916e50c 100755 (executable)
--- a/t/t9135-git-svn-moved-branch-empty-file.sh
+++ b/t/t9135-git-svn-moved-branch-empty-file.sh
@@ -12,7 +12,7 @@ test_expect_success 'clone using git svn' 'git svn clone -s "$svnrepo" x'
 test_expect_success 'test that b1 exists and is empty' '
        (
                cd x &&
-               git reset --hard branch-c &&
+               git reset --hard origin/branch-c &&
                test -f b1 &&
                ! test -s b1
        )