We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent d1871c2 commit 67db5a7Copy full SHA for 67db5a7
spec/integration/resolving_cherry_pick_conflict_spec.rb
@@ -47,6 +47,6 @@
47
48
it 'keeps the commit message from the cherry-picked commit' do
49
subject
50
- `cat .git/MERGE_MSG`.should include 'Add Branch 2 addition'
+ File.read(File.join('.git', 'MERGE_MSG')).should include 'Add Branch 2 addition'
51
end
52
0 commit comments