Brandon Casey  committed 9eda0e9

t4200: remove two unnecessary lines

These two lines appear to be unnecessary. They set variables which are not
used afterwards. The primary motivation to remove them is that the sed
invocation exits non-zero for seds which require newline termination of
input files.

Signed-off-by: Brandon Casey <>
Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits d8b69ec

Comments (0)

Files changed (1)

File t/

 	git add file2 &&
 	git commit -m version2 &&
 	test_must_fail git merge fourth &&
-	sha1=$(sed -e "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1 &&
 	echo Cello > file2 &&
 	git add file2 &&
 	git commit -m resolution