summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-04-17 15:27:53 -0700
committerVicent Martí <vicent@github.com>2013-04-17 15:27:53 -0700
commit53cb87575dc2982d23038e87e87824f8b20fe4be (patch)
treeb27238c89940f796ff5d917c19f82f0672a8eef5
parent437d36662e7bf9680b8eaeec626cfba5f4d68bd9 (diff)
parent8023b83a945eaf3be7baad4fa74d93f4a079be0f (diff)
downloadlibgit2-53cb87575dc2982d23038e87e87824f8b20fe4be.tar.gz
Merge pull request #1478 from ethomson/win32_typechange_test
use a longer string for dummy data in test to avoid conflicting w/ index
-rw-r--r--tests-clar/checkout/typechange.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/checkout/typechange.c b/tests-clar/checkout/typechange.c
index b92cc23fa..6cf99ac15 100644
--- a/tests-clar/checkout/typechange.c
+++ b/tests-clar/checkout/typechange.c
@@ -187,7 +187,7 @@ static void force_create_file(const char *file)
GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS);
cl_assert(!error || error == GIT_ENOTFOUND);
cl_git_pass(git_futils_mkpath2file(file, 0777));
- cl_git_rewritefile(file, "yowza!");
+ cl_git_rewritefile(file, "yowza!!");
}
void test_checkout_typechange__checkout_with_conflicts(void)