From 1b2a60759bd191d19d32fa6cb8bf8ac3bda52322 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Mar 2012 03:57:03 +0000
Subject: * tool/merger.rb (default_merge_branch): use IO.popen to invoke
 pager.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/merger.rb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'tool')

diff --git a/tool/merger.rb b/tool/merger.rb
index ef24027452..2ea388e796 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -185,18 +185,13 @@ else
 
   interactive 'conflicts resolved? (y:yes, a:abort, r:retry, otherwise abort)' do
     f.rewind
-    IO.popen('-', 'wb') do |g|
-      if g
-        g << `svn stat`
-        g << "\n\n"
-        g << f.read
-        g << "\n\n"
-        g << `svn diff --diff-cmd=diff -x -upw`
-      else
-        exec 'less'
-      end
+    IO.popen(ENV["PAGER"] || "less", "w") do |g|
+      g << `svn stat`
+      g << "\n\n"
+      g << f.read
+      g << "\n\n"
+      g << `svn diff --diff-cmd=diff -x -upw`
     end
-    Process.waitall
   end
 
   if system *%w'svn ci -F' + [f.path]
-- 
cgit v1.2.3