No need to call `git pull --merge .` when `git merge` suffices.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t4013-diff-various.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to t/t4013-diff-various.sh +1 −1
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 7fadc985cc..447cf269da 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -65,7 +65,7 @@ test_expect_success setup '
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
git checkout master &&
- git pull -s ours . side &&
+ git merge -s ours side &&
GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
--
2.32.0.40.gb9b36f9b52
Felipe Contreras