Remove filename from conflict markers

diff --git a/t/t4114-apply-typechange.sh b/t/t4114-apply-typechange.sh
index 7dc35dea38b39ebc49c022714779ae07a9c17d88..99ec13dd531c71299681acc3eb678b490ff68707 100755 (executable)
--- a/t/t4114-apply-typechange.sh
+++ b/t/t4114-apply-typechange.sh
@@ -13,7 +13,6 @@ if ! test_have_prereq SYMLINKS
 then
        say 'Symbolic links not supported, skipping tests.'
        test_done
-       exit
 fi
 
 test_expect_success 'setup repository and commits' '