Catalin Marinas <catalin.marinas@xxxxxxx> writes: > Are there any features in "merge" and not available in "diff3"? `merge' from GNU RCS is just a wrapper around diff3. -- Romain Francoise <romain@xxxxxxxxxxxxx> | The sea! the sea! the open it's a miracle -- http://orebokech.com/ | sea! The blue, the fresh, the | ever free! --Bryan W. Procter - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html