equal
deleted
inserted
replaced
|
1 Patch to allow us to specify an alternate conflict binary when running tests. |
|
2 |
|
3 This patch should be sent upstream. |
|
4 |
|
5 --- conflict-20140723/run_test.sh.orig 2015-08-04 07:48:20.892345554 -0700 |
|
6 +++ conflict-20140723/run_test.sh 2015-08-04 07:49:21.230009358 -0700 |
|
7 @@ -2,7 +2,7 @@ |
|
8 # $Id: run_test.sh,v 6.3 2004/06/20 23:13:23 tom Exp $ |
|
9 # Run a test to show that CONFLICT is working |
|
10 BIN=`pwd` |
|
11 -PROG=$BIN/conflict |
|
12 +PROG="${CONFLICT_BIN:-$BIN/conflict}" |
|
13 PATH=".:$BIN:/bin"; export PATH |
|
14 # |
|
15 cat <<eof/ |