From 23c8aac2bacfee96e0faedb84d0b72893f13c6ec Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Tue, 28 Jan 2014 19:19:16 +1300
Subject: Make debugging merge.py in the test suite possible.

Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba
---
 test_merge.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_merge.bash b/test_merge.bash
index 2f8a4cc9..61462f66 100755
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -12,7 +12,7 @@ run_test() {
     local expected=$2
     result=$(mktemp /tmp/test_merge.XXXXXX)
     fail=0
-    $cmd > $result
+    $cmd --output $result
     if ! cmp $result $expected ; then
         diff -u $expected $result || :
         echo FAIL - $cmd result does not match expected
-- 
cgit 1.2.3-korg