{"thread":{"id":"3748","subject":"RE: Is 'merge' in your path?","startedAt":"2006-03-29T09:06:40Z","lastAt":"2006-03-29T10:14:08Z","messageCount":3,"participants":["Brown, Len","Catalin Marinas","Romain Francoise"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18113","messageId":"CFF307C98FEABE47A452B27C06B85BB6046AA9@hdsmsx411.amr.corp.intel.com","threadId":"3748","inReplyTo":null,"subject":"RE: Is 'merge' in your path?","fromName":"Brown, Len","fromEmail":"len.brown@intel.com","sentAt":"2006-03-29T09:06:40Z","receivedAt":"2006-03-29T09:06:40Z","isPatch":false,"sender":{"key":"len.brown@intel.com","avatar":"https://gravatar.com/avatar/a091f34f66caadb51d85a8a496800c6ccae73737e2f45762373e6b8c55fa5dd6?d=mp&s=160"},"body":" \n>What does \"which merge\" tell you? If it turns up blank, you know the \n>problem. The merge program is usually found in the rcs package.\n\nblank indeed.  I guess I don't have rcs on this laptop.\n\nthanks,\n-Len\n"},{"id":"18115","messageId":"tnxmzf9sh7k.fsf@arm.com","threadId":"3748","inReplyTo":"CFF307C98FEABE47A452B27C06B85BB6046AA9@hdsmsx411.amr.corp.intel.com","subject":"Re: Is 'merge' in your path?","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@arm.com","sentAt":"2006-03-29T10:01:03Z","receivedAt":"2006-03-29T10:01:03Z","isPatch":false,"sender":{"key":"catalin.marinas@arm.com","avatar":null},"body":"\"Brown, Len\" <len.brown@intel.com> wrote:\n>>What does \"which merge\" tell you? If it turns up blank, you know the \n>>problem. The merge program is usually found in the rcs package.\n>\n> blank indeed.  I guess I don't have rcs on this laptop.\n\nActually, I think git could use diff3 directly and not rely on \"merge\"\nfrom rcs which seems to be equivalent to \"diff3 -m -E\" (it might even\ncall diff3, I'm not sure).\n\nAre there any features in \"merge\" and not available in \"diff3\"?\n\n-- \nCatalin\n"},{"id":"18116","messageId":"87mzf9eexb.fsf@pacem.orebokech.com","threadId":"3748","inReplyTo":"tnxmzf9sh7k.fsf@arm.com","subject":"Re: Is 'merge' in your path?","fromName":"Romain Francoise","fromEmail":"romain@orebokech.com","sentAt":"2006-03-29T10:14:08Z","receivedAt":"2006-03-29T10:14:08Z","isPatch":false,"sender":{"key":"romain@orebokech.com","avatar":"https://avatars.githubusercontent.com/u/49197?v=4"},"body":"Catalin Marinas <catalin.marinas@arm.com> writes:\n\n> Are there any features in \"merge\" and not available in \"diff3\"?\n\n`merge' from GNU RCS is just a wrapper around diff3.\n\n-- \nRomain Francoise <romain@orebokech.com> | The sea! the sea! the open\nit's a miracle -- http://orebokech.com/ | sea! The blue, the fresh, the\n                                        | ever free! --Bryan W. Procter\n"}]}