diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-25 23:36:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 00:24:15 -0800 |
| commit | 5bd74506cd30e897d1493639b7438c6cc80dea8e (patch) | |
| tree | 760231bfddbada6a4bf99a36749cd93b823ce775 /t/t6024-recursive-merge.sh | |
| parent | 0c725f1bd938fa2b626e910773e622a385daced2 (diff) | |
| download | git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.gz | |
Get rid of the dependency to GNU diff in the tests
Now that "git diff" handles stdin and relative paths outside the
working tree correctly, we can convert all instances of "diff -u"
to "git diff".
This commit is really the result of
$ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
Diffstat (limited to 't/t6024-recursive-merge.sh')
| -rw-r--r-- | t/t6024-recursive-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 31b96257b4..a398556137 100644 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -70,7 +70,7 @@ G >>>>>>> G:a1 EOF -test_expect_success "result contains a conflict" "diff -u expect a1" +test_expect_success "result contains a conflict" "git diff expect a1" git ls-files --stage > out cat > expect << EOF @@ -79,6 +79,6 @@ cat > expect << EOF 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 EOF -test_expect_success "virtual trees were processed" "diff -u expect out" +test_expect_success "virtual trees were processed" "git diff expect out" test_done |