Junio C Hamano schrieb: > +--conflict=<style>:: > + The same as --merge option above, but changes the way the > + conflicting hunks are presented, overriding the > + merge.conflictstyle configuration variable. Possible values are > + "merge" (default) and "diff3" (in addition to what is shown by > + "merge" style, shows the original contents). > + If --conflict is basically the same as --merge, couldn't we then pass style argument to --merge or omit it to get the default style? -- Hannes -- 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
