4745N/APatch to allow us to specify an alternate conflict binary when running tests.

4745N/A

4745N/AThis patch should be sent upstream.

4745N/A

4745N/A--- conflict-20140723/run_test.sh.orig 2015-08-04 07:48:20.892345554 -0700

4745N/A+++ conflict-20140723/run_test.sh 2015-08-04 07:49:21.230009358 -0700

4745N/A@@ -2,7 +2,7 @@

4745N/A # $Id: run_test.sh,v 6.3 2004/06/20 23:13:23 tom Exp $

4745N/A # Run a test to show that CONFLICT is working

4745N/A BIN=`pwd`

4745N/A-PROG=$BIN/conflict

4745N/A+PROG="${CONFLICT_BIN:-$BIN/conflict}"

4745N/A PATH=".:$BIN:/bin"; export PATH

4745N/A #

4745N/A cat <<eof/