Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t6036: fix broken && chain in sub-shell
author
Ramsay Jones
<ramsay@ramsayjones.plus.com>
Thu, 12 Jul 2018 15:32:25 +0000
(16:32 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 12 Jul 2018 18:48:52 +0000
(11:48 -0700)
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6036-recursive-corner-cases.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
327ac9c
)
diff --git
a/t/t6036-recursive-corner-cases.sh
b/t/t6036-recursive-corner-cases.sh
index 74e5920bc67a3f31a7e4656eae4523381eec0117..ef1c26ec588995499fd9a07c2816ea47d4faa6e9 100755
(executable)
--- a/
t/t6036-recursive-corner-cases.sh
+++ b/
t/t6036-recursive-corner-cases.sh
@@
-495,7
+495,7
@@
test_expect_success 'setup differently handled merges of directory/file conflict
test_write_lines 1 2 3 4 5 6 7 8 >a &&
git add a &&
git commit -m E3 &&
- git tag E3
+ git tag E3
&&
git checkout C^0 &&
test_must_fail git merge B^0 &&