We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 67db5a7 commit 7a42231Copy full SHA for 7a42231
spec/integration/resolving_cherry_pick_conflict_spec.rb
@@ -42,7 +42,7 @@
42
43
it 'does not remove the CHERRY_PICK_HEAD file' do
44
subject
45
- `ls -al .git`.should include 'CHERRY_PICK_HEAD'
+ Dir['.git/*'].should include '.git/CHERRY_PICK_HEAD'
46
end
47
48
it 'keeps the commit message from the cherry-picked commit' do
0 commit comments