Date: Wed, 17 Sep 2003 08:53:20 +0900 From: Rob Lahaye <lahaye@snu.ac.kr> To: Matthew Seaman <m.seaman@infracaninophile.co.uk> Cc: freebsd-questions@freebsd.org Subject: Re: Q: mergemaster 'm'-merge option results in empty file Message-ID: <3F67A270.4070403@snu.ac.kr> In-Reply-To: <20030914160132.GB26949@happy-idiot-talk.infracaninophile.co.uk> References: <3F64552C.7060900@snu.ac.kr> <20030914160132.GB26949@happy-idiot-talk.infracaninophile.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
Thank you so much for the long and detailed description. I'm waiting for the first release candidate of 4.9 to test it out. (BTW: RC1 should have been there already; is there a delay?). Regards, Rob. Matthew Seaman wrote: > On Sun, Sep 14, 2003 at 08:46:52PM +0900, Rob Lahaye wrote: > > >>What is left and right in the mergemaster context??? >>'man sdiff' doesn't seem to help out here. >>I've tried a bit (I typed 'v' and 'q'), but then found /etc/hosts >>totally empty!! >> >>Any idea where I went wrong? > > > 'sdiff' does a side-by-side comparison of two files, and lets you > generate a file where some or all of those differences have been > merged together. 'left' and 'right' in this context refer to the two > columns that sdiff divides the screen into, where it shows you the > blocks of lines that differ between the two files you're comparing. > > Perhaps an example is in order. Run these commands to get two > different versions of the GENERIC kernel configuration from cvs: [...]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F67A270.4070403>