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>
Brandon Casey committed
May 6, 2009 at 17:56 UTC
9eda0e980a43e6bf5167e1b35f457f970bec7b74
1 file changed
-2
t/t4200-rerere.sh
-2
@@ -190,8 +190,6 @@ test_expect_success 'file2 added differently in two branches' '
190
git add file2 &&
191
git commit -m version2 &&
192
test_must_fail git merge fourth &&
193
- sha1=$(sed -e "s/ .*//" .git/MERGE_RR) &&
194
- rr=.git/rr-cache/$sha1 &&
193
echo Cello > file2 &&
194
git add file2 &&
195
git commit -m resolution