Date: Thu, 28 Jan 1999 16:33:14 +0100 From: Jos Backus <Jos.Backus@nl.origin-it.com> To: freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster rocks! Message-ID: <19990128163314.F80672@hal.mpn.cp.philips.com> In-Reply-To: <199901281431.JAA30813@whizzo.transsys.com>; from Louis A. Mamakos on Thu, Jan 28, 1999 at 09:31:05AM -0500 References: <199901280812.TAA29221@lightning.itga.com.au> <19990128024920.C16540@futuresouth.com> <199901281431.JAA30813@whizzo.transsys.com>
index | next in thread | previous in thread | raw e-mail
On Thu, Jan 28, 1999 at 09:31:05AM -0500, Louis A. Mamakos wrote:
> It would also be nice if you could specify your own replacement for
> 'sdiff'. I'd much prefer to use ediff mode inside of emacs to do the
> merging.. I end up doing this by hand after the fact.
Another idea: if, say, your PAGER lives in /usr/local/bin, make it find it:
--- mergemaster.orig Thu Jan 28 16:31:16 1999
+++ mergemaster Thu Jan 28 16:31:55 1999
@@ -12,6 +12,7 @@
# $Date: 1998/09/28 03:40:04 $
PATH=/bin:/usr/bin:/usr/sbin
+test -d /usr/local/bin && PATH=/usr/local/bin:$PATH
display_usage ( ) {
VERSION_NUMBER=`grep "[$]Revision:" $0 | cut -d ' ' -f 3`
Cheers,
--
Jos Backus _/ _/_/_/ "Reliability means never
_/ _/ _/ having to say you're sorry."
_/ _/_/_/ -- D. J. Bernstein
_/ _/ _/ _/
Jos.Backus@nl.origin-it.com _/_/ _/_/_/ use Std::Disclaimer;
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990128163314.F80672>