Skip to content

Commit 67db5a7

Browse files
committed
Use File.read instead of cat
1 parent d1871c2 commit 67db5a7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

spec/integration/resolving_cherry_pick_conflict_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@
4747

4848
it 'keeps the commit message from the cherry-picked commit' do
4949
subject
50-
`cat .git/MERGE_MSG`.should include 'Add Branch 2 addition'
50+
File.read(File.join('.git', 'MERGE_MSG')).should include 'Add Branch 2 addition'
5151
end
5252
end

0 commit comments

Comments
 (0)