# 
# patch "ChangeLog"
#  from [dabaf521855697e3621527d7a6663b65e866cda4]
#    to [f6cdda7edce9883de78d2735ca3bdfc4ef6db543]
# 
# patch "tests/t_fmerge.at"
#  from [2eb93d63e027ec736864c3819d31a32afcfb2bc1]
#    to [36444e113e47fc902395964173dd551d9e923ce7]
# 
# patch "testsuite.at"
#  from [63d932e7386deef0a18a2723c847f8628e0737c1]
#    to [f9801da558a13e2d2ab4fa73d1ad6acefe1eeb86]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-05-30  Matt Johnston  <address@hidden>
+
+	* testsuite.at: use "command -v" rather than "which", since
+	Solaris doesn't give useful exit codes for "which".
+	* tests/t_fmerge.at: don't use --merge with diff3, pipe to ed instead
+	so we don't rely on gnu diff3.
+
 2005-05-29  Timothy Brownawell  <address@hidden>
 
 	* contrib/monoprof.sh: Add support for using valgrind for
--- tests/t_fmerge.at
+++ tests/t_fmerge.at
@@ -231,8 +231,8 @@
 AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout merge.monotone, [], [ignore], [ignore])
 
-AT_CHECK(diff3 -E --merge left ancestor right, [], [stdout], [ignore])
-AT_CHECK(mv stdout merge.diff3, [], [ignore], [ignore])
+AT_CHECK(cp left merge.diff3)
+AT_CHECK(diff3 -E left ancestor right | ed merge.diff3, [], [], [ignore])
 
 AT_CHECK(cmp merge.monotone merge.diff3, [], [ignore], [ignore])
 
--- testsuite.at
+++ testsuite.at
@@ -249,9 +249,9 @@
 # After calling NEED_UNB64, you can use UNB64(infile, outfile) to
 # decode base64'ed text.
 m4_define([NEED_UNB64], [
-if which mimencode 2>/dev/null; then
+if test -n "`command -v mimencode`" 2>/dev/null; then
   UNB64_COMMAND="mimencode -u"
-elif which recode 2>/dev/null; then
+elif test -n "`command -v recode`" 2>/dev/null; then
   UNB64_COMMAND="recode /Base64"
 elif perl -MMIME::Base64 -e 1 2>/dev/null; then
   UNB64_COMMAND="perl -MMIME::Base64 -ne 'print decode_base64(\$_)'"
@@ -280,7 +280,7 @@
 # After calling NEED_UNGZ, you can use UNGZ(infile, outfile) to
 # decode gzipped text.
 m4_define([NEED_UNGZ], [
-if which gunzip 2>/dev/null; then
+if test -n "`command -v gunzip`" 2>/dev/null; then
   # This is lame!  We should XFAIL the test so the user knows that
   # they're not, you know, actually testing the software.  But
   # Autotest runs XFAIL conditions in a completely different shell, so