mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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 <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d8b69ecb4c
commit
9eda0e980a
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue