Re: [PATCH 2/4] t7610: make tests more independent and debuggable
From: Simon Ruderich <hidden>
Date: 2017-01-05 12:25:49
On Tue, Jan 03, 2017 at 07:50:40PM -0500, Richard Hansen wrote:
quoted hunk ↗ jump to hunk
[snip]@@ -145,8 +148,13 @@ test_expect_success 'mergetool in subdir' ' ' test_expect_success 'mergetool on file in parent dir' ' + git reset --hard && + git checkout -b test$test_count branch1 && + git submodule update -N && ( cd subdir && + test_must_fail git merge master >/dev/null 2>&1 && + ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
This change seems unrelated to the changes mentioned in the commit message. Was it intended? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9
Attachments
- signature.asc [application/pgp-signature] 833 bytes