Date: Thu, 18 Mar 2004 10:03:05 +1030 From: "Vandertouw, Justin (DEH)" <Vandertouw.Justin@saugov.sa.gov.au> To: "'freebsd-cvsweb@freebsd.org'" <freebsd-cvsweb@freebsd.org> Subject: Re: Option to ignore Windows linefeeds when diff-ing Message-ID: <7108E4F65252BD42BA13488051EBE3022A1612@sagemsg0010.sagemsmrd01.sa.gov.au>
next in thread | raw e-mail | index | archive | help
On Wed, 17 Mar 2004 21:29:19 +0200 VilleSkytt?<scop@FreeBSD.org> wrote: >On Wed, 2004-03-03 at 02:40, Vandertouw, Justin (DEH) wrote: >> then i thought maybe we could let the user tell cvsweb diff to ignore the >> end-of-line (^M) that Windows inserts. >Maybe adding some switches to diff(1) in cvsweb.cgi's %DIFFTYPES helps, >for example (some of) -w -b -B? good idea1 i've implemented this - the users have since indicated that they also want merge to ignore ^Ms so i think the problem need sto be fixed at its source ie, remove the ^Ms automagically (and appropriately) at check-in time, so i have a little job to research ;)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7108E4F65252BD42BA13488051EBE3022A1612>