Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index d33d7140060613fbec4c45dc8d2c86394d64b4fa..fb41876677a9025f2d267ade0c8898e63022a704 100755 (executable)
--- a/t/t9114-git-svn-dcommit-merge.sh
+++ b/t/t9114-git-svn-dcommit-merge.sh
@@ -48,7 +48,7 @@ test_expect_success 'setup svn repository' '
 test_expect_success 'setup git mirror and merge' '
        git svn init "$svnrepo" -t tags -T trunk -b branches &&
        git svn fetch &&
-       git checkout -b svn remotes/trunk &&
+       git checkout -b svn remotes/origin/trunk &&
        git checkout -b merge &&
        echo new file > new_file &&
        git add new_file &&
@@ -81,7 +81,7 @@ test_debug 'gitk --all & sleep 1'
 
 test_expect_success 'verify post-merge ancestry' "
        test x\`git rev-parse --verify refs/heads/svn\` = \
-            x\`git rev-parse --verify refs/remotes/trunk \` &&
+            x\`git rev-parse --verify refs/remotes/origin/trunk \` &&
        test x\`git rev-parse --verify refs/heads/svn^2\` = \
             x\`git rev-parse --verify refs/heads/merge\` &&
        git cat-file commit refs/heads/svn^ | grep '^friend$'