@ -74,7 +74,7 @@ test_expect_success 'Setup rename with file on one side matching different dirna
@@ -74,7 +74,7 @@ test_expect_success 'Setup rename with file on one side matching different dirna
@ -439,7 +439,7 @@ test_expect_success 'setup both rename source and destination involved in D/F co
@@ -439,7 +439,7 @@ test_expect_success 'setup both rename source and destination involved in D/F co
mkdir one &&
echo stuff >one/file &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git mv one/file destdir &&
git commit -m "Renamed to destdir" &&
@ -479,7 +479,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' '
@@ -479,7 +479,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' '
echo stuff >one/file &&
echo other >two/file &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git rm -rf one &&
git mv two/file one &&
@ -539,7 +539,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa
@@ -539,7 +539,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa
echo stuff >original &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
mkdir two &&
>two/file &&
@ -583,7 +583,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
@@ -583,7 +583,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
@ -649,7 +649,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
@@ -649,7 +649,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic