# RE: Is 'merge' in your path? 3 messages from 2006-03-29 to 2006-03-29. Participants: Brown, Len, Catalin Marinas, Romain Francoise. Thread: https://gitlist.dev/t/3748 ## Brown, Len, 2006-03-29 09:06 Subject: RE: Is 'merge' in your path? Message-ID: URL: https://gitlist.dev/e/CFF307C98FEABE47A452B27C06B85BB6046AA9%40hdsmsx411.amr.corp.intel.com ``` >What does "which merge" tell you? If it turns up blank, you know the >problem. The merge program is usually found in the rcs package. blank indeed. I guess I don't have rcs on this laptop. thanks, -Len ``` ## Catalin Marinas, 2006-03-29 10:01 Subject: Re: Is 'merge' in your path? Message-ID: URL: https://gitlist.dev/e/tnxmzf9sh7k.fsf%40arm.com In-Reply-To: ``` "Brown, Len" wrote: >>What does "which merge" tell you? If it turns up blank, you know the >>problem. The merge program is usually found in the rcs package. > > blank indeed. I guess I don't have rcs on this laptop. Actually, I think git could use diff3 directly and not rely on "merge" from rcs which seems to be equivalent to "diff3 -m -E" (it might even call diff3, I'm not sure). Are there any features in "merge" and not available in "diff3"? -- Catalin ``` ## Romain Francoise, 2006-03-29 10:14 Subject: Re: Is 'merge' in your path? Message-ID: <87mzf9eexb.fsf@pacem.orebokech.com> URL: https://gitlist.dev/e/87mzf9eexb.fsf%40pacem.orebokech.com In-Reply-To: ``` Catalin Marinas writes: > Are there any features in "merge" and not available in "diff3"? `merge' from GNU RCS is just a wrapper around diff3. -- Romain Francoise | The sea! the sea! the open it's a miracle -- http://orebokech.com/ | sea! The blue, the fresh, the | ever free! --Bryan W. Procter ```