diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2009-05-06 17:56:17 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-06 16:43:28 -0700 |
| commit | 9eda0e980a43e6bf5167e1b35f457f970bec7b74 (patch) | |
| tree | 9d17b511e7e15e57ad7b97b4d08765c7104de40e /t/t4200-rerere.sh | |
| parent | d8b69ecb4c467c044c08e0435bb22ade16ea580f (diff) | |
| download | git-9eda0e980a43e6bf5167e1b35f457f970bec7b74.tar.gz | |
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>
Diffstat (limited to 't/t4200-rerere.sh')
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index b68ab11f29..504802c987 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -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 |