Commit Diff


commit - 83c8b3b81dddacaeb4db8081fdcfd68c514f4276
commit + 461aee03b5f615d3fb11add47137103d3003b61e
blob - 085d355fc26b777baecf7ba30412ab70430e6bfe
blob + e0614278591e6b543ec9de879fdd0e6eb1f589f1
--- regress/cmdline/commit.sh
+++ regress/cmdline/commit.sh
@@ -214,7 +214,7 @@ function test_commit_added_subdirs {
 }
 
 function test_commit_rejects_conflicted_file {
-	local testroot=`test_init update_rejects_conflicted_file`
+	local testroot=`test_init commit_rejects_conflicted_file`
 
 	local initial_rev=`git_show_head $testroot/repo`