From 9c51ef5bc44fc50e9e89a622cf566c6aae0449b4 Mon Sep 17 00:00:00 2001
From: aycabta <aycabta@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 21 Apr 2019 07:37:34 +0000
Subject: Merge upstream of Reline

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/reline/config_test.rb          | 2 +-
 test/reline/key_actor_emacs_test.rb | 2 +-
 test/reline/key_actor_vi_test.rb    | 2 +-
 test/reline/key_stroke_test.rb      | 2 +-
 test/reline/kill_ring_test.rb       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/reline')

diff --git a/test/reline/config_test.rb b/test/reline/config_test.rb
index 053711f7cb..34ee407498 100644
--- a/test/reline/config_test.rb
+++ b/test/reline/config_test.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 
 class Reline::Config::Test < Reline::TestCase
   def setup
diff --git a/test/reline/key_actor_emacs_test.rb b/test/reline/key_actor_emacs_test.rb
index e9ca433d8a..c387f1c4ee 100644
--- a/test/reline/key_actor_emacs_test.rb
+++ b/test/reline/key_actor_emacs_test.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'stringio'
 
 class Reline::KeyActor::Emacs::Test < Reline::TestCase
diff --git a/test/reline/key_actor_vi_test.rb b/test/reline/key_actor_vi_test.rb
index 763411199a..3f8d0fb462 100644
--- a/test/reline/key_actor_vi_test.rb
+++ b/test/reline/key_actor_vi_test.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 
 class Reline::KeyActor::ViInsert::Test < Reline::TestCase
   def setup
diff --git a/test/reline/key_stroke_test.rb b/test/reline/key_stroke_test.rb
index 65d24cadb1..b6d5ce4150 100644
--- a/test/reline/key_stroke_test.rb
+++ b/test/reline/key_stroke_test.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 
 class Reline::KeyStroke::Test < Reline::TestCase
   using Module.new {
diff --git a/test/reline/kill_ring_test.rb b/test/reline/kill_ring_test.rb
index fa871da4aa..8bebfe2177 100644
--- a/test/reline/kill_ring_test.rb
+++ b/test/reline/kill_ring_test.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 
 class Reline::KillRing::Test < Reline::TestCase
   def setup
-- 
cgit v1.2.3