Yep... OSX doesn't have the -f option. I am now getting:
./simple/multiple-add/merge FAILED /usr/bin/time: illegal option -- f usage: time [_lp] command. --- wmerge 2003-05-01 05:22:51.000000000 +0200 +++ - 2011-03-30 08:36:22.000000000 +0200 @@ -1,9 +0,0 @@ -This -is -the -current -version -of -the -file<<<---.|||=== that has changed--->>> - ./simple/multiple-add/wmerge FAILED /usr/bin/time: illegal option -- f usage: time [_lp] command. --- merge 2010-03-24 07:31:12.000000000 +0100 +++ - 2011-03-30 08:36:22.000000000 +0200 @@ -1,9 +0,0 @@ -<<<<<<< -c -||||||| -*** 1,1 **** 1 -a -======= -*** 1,1 **** 1 -b ->>>>>>> ./simple/trivial-conflict/merge FAILED /usr/bin/time: illegal option -- f usage: time [_lp] command. 0 succeeded and 58 failed make: *** [test] Error 1 [bolt:~/downloads/wiggle_0.8]
