Steffen Prohaska <prohaska@xxxxxx> writes: > On May 6, 2008, at 12:53 PM, Sebastian Schuberth wrote: > >> When run from the command line, ECMerge does not automatically use >> the same >> settings for a merge / diff that it would use when starting the GUI >> and loading >> files manually. In the first case the built-in factory defaults >> would be used, >> while in the second case the settings the user has specified in the >> GUI would >> be used, which can be misleading. Specifying the "--default" command >> line >> option changes this behavior so that always the user specfified GUI >> settings >> are used. > > I tested the change and propose to take the patch. I needed, > however, to remove dos line endings from the patch before it > applied cleanly. Thanks, I did not have that "apply" problem. Queued. -- To unsubscribe from this list: 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
