t7610-mergetool: add missing && and remove commented-out code
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Oct 15, 2014 at 01:35 UTC
4756c05741164a0889212f1e8151ff081b75bba2
1 file changed
+2
-8
t/t7610-mergetool.sh
+2
-8
@@ -192,7 +192,7 @@ test_expect_success 'mergetool merges all from subdir' '
192
test_expect_success 'mergetool skips resolved paths when rerere is active' '
193
git config rerere.enabled true &&
194
rm -rf .git/rr-cache &&
195
- git checkout -b test5 branch1
195
+ git checkout -b test5 branch1 &&
196
git submodule update -N &&
197
test_must_fail git merge master >/dev/null 2>&1 &&
198
( yes "l" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&
@@ -231,18 +231,12 @@ test_expect_success 'conflicted stash sets up rerere' '
231
'
232
233
test_expect_success 'mergetool takes partial path' '
234
- git reset --hard
234
+ git reset --hard &&
235
git config rerere.enabled false &&
236
git checkout -b test12 branch1 &&
237
git submodule update -N &&
238
test_must_fail git merge master &&
239
240
- #should not need these lines
241
- #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
242
- #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
243
- #( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
244
- #( yes "" | git mergetool file1 file2 >/dev/null 2>&1 ) &&
245
-
240
( yes "" | git mergetool subdir ) &&
241
242
test "$(cat subdir/file3)" = "master new sub" &&