projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.19.5
[platform/upstream/git.git]
/
t
/
t3403-rebase-skip.sh
diff --git
a/t/t3403-rebase-skip.sh
b/t/t3403-rebase-skip.sh
index
3968020
..
1f5122b
100755
(executable)
--- a/
t/t3403-rebase-skip.sh
+++ b/
t/t3403-rebase-skip.sh
@@
-67,7
+67,7
@@
test_expect_success 'rebase --skip with --merge' '
'
test_expect_success 'merge and reference trees equal' '
- test -z "
`git diff-tree skip-merge skip-reference`
"
+ test -z "
$(git diff-tree skip-merge skip-reference)
"
'
test_expect_success 'moved back to branch correctly' '