Re: [Gnu-arch-users] =partner-versions

[Miles Bader]

On Mon, May 31, 2004 at 06:30:02PM -0400, Aaron Bentley wrote:
> >I'm not sure what you mean; _explicit_ conflicts (where a "C" gets
> >printed) always generates a .rej file as far as I know.  Certainly the
> >presence or absence of .rej files has always been a reliable indicator in
> >my experience.  Do you have a case in mind where it's not?
> 
> star-merge --three-way produces inline conflict markers, not orig/rej.

Actually, star-merge --three-way _does_ create vestigial .rej/.orig files,
presumably for exactly this reason.

-Miles
-- 
=====
(^o^;
(()))
*This is the cute octopus virus, please copy it into your sig so it can spread.