Skip to content

Commit

Permalink
t4200: remove two unnecessary lines
Browse files Browse the repository at this point in the history
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 <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brandon Casey authored and Junio C Hamano committed May 6, 2009
1 parent d8b69ec commit 9eda0e9
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions t/t4200-rerere.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ test_expect_success 'file2 added differently in two branches' '
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
Expand Down

0 comments on commit 9eda0e9

Please sign in to comment.