Re: [jamboost] Perforce Jam 2.4 integration

From: David Abrahams (david.abrahams_at_[hidden])
Date: 2002-02-13 12:08:29

----- Original Message -----
From: "Rene Rivera" <grafik666_at_[hidden]>
>
> The platform differs :-) I go from RedHat, to Win2K, to YellowDog, to
MacOS,
> to OpenBSD. But my prefered editor on Linux is SciTE not emacs. But I
could
> use the diff3! But oh I

See enclosed source. It's an expedient hack (I didn't make it flexible,
accept new options or anything). I'm sending the original + modified GNU
diff3.c source.

>Well, merging 3 directories is trivial. It's in the menu bar ;-)
>
> It's the rest of the navigation and use that bothers me :-\

You can put it in vi mode if you're so inclined. I don't know about SciTE,
though.
 ------=_NextPart_000_0943_01C1B487.25CB4E30 Content-Type: application/octet-stream;
name="diff3.c"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="diff3.c"

[Attachment content not displayed.] ------=_NextPart_000_0943_01C1B487.25CB4E30 Content-Type: application/octet-stream;
name="diff3.c.orig"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="diff3.c.orig"

[Attachment content not displayed.] ------=_NextPart_000_0943_01C1B487.25CB4E30--