[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Conflicts/*.rej files
|
From: |
Rob Weir |
|
Subject: |
Re: [Gnu-arch-users] Conflicts/*.rej files |
|
Date: |
Wed, 31 Dec 2003 11:56:47 +1100 |
|
User-agent: |
Mutt/1.5.4i |
On Sun, Dec 28, 2003 at 10:58:51AM +1100, Brian May said
> So far, I have done this manually, but IMHO it is not as easy as inline
> {CVS,subversion} conflict markers.
star-merge has a -t option for in-file conflict markers.
--
Rob Weir <address@hidden> | address@hidden | Do I look like I want a CC?
Words of the day: bomb terrorist top secret Glock CNCIS enigma emc nuclear
signature.asc
Description: Digital signature