diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-15 08:23:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-15 08:23:26 (GMT) |
| commit | 1f9ff0de82f0f2990f3d6f06dad1d381158c2a75 (patch) | |
| tree | b5d6a8057d5e8116df2b3d05779abf861bc42909 /t/t6031-merge-recursive.sh | |
| parent | 1f17868b303f762556034db81d02c55de2878e07 (diff) | |
| download | git-1f9ff0de82f0f2990f3d6f06dad1d381158c2a75.zip git-1f9ff0de82f0f2990f3d6f06dad1d381158c2a75.tar.gz git-1f9ff0de82f0f2990f3d6f06dad1d381158c2a75.tar.bz2 | |
Redo "add test_cmp function for test scripts"
We had a handful test updates since we accepted 82ebb0b (add test_cmp
function for test scripts). This fixes them up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6031-merge-recursive.sh')
| -rwxr-xr-x | t/t6031-merge-recursive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index 5bb6b93..c8310ae 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -42,7 +42,7 @@ test_expect_success 'mode change in both branches: expect conflict' ' echo "100755 $H 2 file2" echo "100644 $H 3 file2" ) >expect && - diff -u actual expect && + test_cmp actual expect && test -x file2 ' |